Git merge squash

Solve Merge Conflict with git merge --continue

警告： git merge 不鼓励使用不平凡的未提交更改：尽管可能，但可能会让您处于难以在冲突情况下退出的状态。 第四种语法（“ git merge --continue ...

git merge continue - How do I finish the merge after resolving my merge conflicts? · switch to ex...

git status On branch cat You have unmerged paths. (fix conflicts and run "git commit") (use "git ...