我将另一个分支 rebase(变基) 到我的 checkout 分支上,但在 rebase 过程中出现了冲突。我解决了合并冲突。
$ git status
rebase in progress; onto 77c951b
You are currently rebasing branch 'test' on '77c951b'.
(all conflicts fixed: run "git rebase --continue")
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: br_boss_buha_faktura/forms/br_boss_buha_faktura_head_dtl.frm
modified: br_boss_buha_faktura/valuelists/br_boss_buha_faktura_client.val
new file: br_boss_buha_faktura/valuelists/br_boss_buha_faktura_client_name.val
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: br_boss_buha_faktura/valuelists/br_boss_buha_faktura_client.val
我需要提交已解决的合并冲突 git commit
吗?还是可以直接使用 git rebase --continue
继续进行?
我需要提交已解决的合并冲突git commit
吗?还是可以直接使用git rebase --continue
继续进行?