我想衍合我的地方分支对主分支。 从我local_branch,我已经执行了以下命令衍合. 我已经练习使用命令行程序(i。e Git Bash)对于一些时间,并想使用的相同解决当前的问题。
我可以使用Visual Studio代码的工具,以接受当前/incoming/两改变..但是没有一种方法来执行同样令庆典? 还对以下情况,这将是首选的方式来解决?
> git pull --rebase origin master
> git status
interactive rebase in progress; onto 53681c8
Last commands done (2 commands done):
pick 89bb0987 Updated messenger.xml
pick 990bn189 Updated messenger.xml
Next commands to do (9 remaining commands):
pick 6780f98 Updated messenger.xml
pick 9091m969 Updated updated_numbers.xml
(use "git rebase --edit-todo" to view and edit)
You are currently rebasing branch 'feature-jd-bulk-messenger' on '53681c8'.
(fix conflicts and then run "git rebase --continue")
(use "git rebase --skip" to skip this patch)
(use "git rebase --abort" to check out the original branch)
Unmerged paths:
(use "git restore --staged <file>..." to unstage)
(use "git add <file>..." to mark resolution)
both modified: jd-test/admin/messenger.xml