【git】冲突解决

1、来到 master 分支 —— > git pull origin master
2、来到 feat 开发分支 ——> git rebase master
冲突

wjy@123deMacBook-Pro erda % git rebase master
Auto-merging pkg/arrays/arrays.go
CONFLICT (content): Merge conflict in pkg/arrays/arrays.go
Auto-merging pkg/arrays/arrays_test.go
CONFLICT (content): Merge conflict in pkg/arrays/arrays_test.go
error: could not apply d599ade49... feat: metrics addition item IDs
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply d599ade49... feat: metrics addition item IDs

3、手动选择

<<<<<<< HEAD
// 以下是当前分支的更改
// ...
=======
// 以下是 master 分支的更改
// ...
>>>>>>> d599ade49... feat: metrics addition item IDs

解决冲突意味着根据需要手动编辑这个文件，将冲突标记和不需要的更改部分删除或修改。

4、git add .
5、git rebase --continue

即可解决冲突，最后push即可