git 这个冲突如何处理

Question

如题.
问题关键点.当前在dev分支,执行了git pull --rebase后,本地就切换到a6090c2这个节点了,变成了空分支

操作了几次,结果还一样

wab@a111999:~/pc$ git pull --rebase
Auto-merging src/views/order/book.vue
CONFLICT (content): Merge conflict in src/views/order/book.vue
error: could not apply a6090c2... 修改
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply a6090c2... 修改

Answer 1

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".

1. 手动修改冲突文件并保存
2. git add 冲突文件
3. git rebase --continue