Resolve Git merge conflicts in favor of their changes during a pull
Or, simply, for the default repository: If you’re already in conflicted state…
git-merge-conflict
Git error on commit after merge – fatal: cannot do a partial commit during a merge
I found that adding “-i” to the commit command fixes this problem for me. The -i basically tells it to stage additional files before committing. That is:
How to resolve merge conflicts in a Git repository
Try: git mergetool It opens a GUI that steps you through each conflict, and you get to choose how to merge. Sometimes it requires a bit of hand editing afterwards, but usually it’s enough by itself. It is much better than doing the whole thing by hand certainly. As per Josh Glover’s comment: The command … Read more