Resolving merge conflicts in Git
From genomewiki
Jump to navigationJump to search
Why would my Merge Fail?
There are 3 scenarios that could result in a Failed Merge.
- Changes are only in your working directory
- Changes are staged by not committed
- Changes are committed but Git could not resolve merge on its own
Scenarios
Git refuses to start a merge/pull
Error Messages:
- error: Entry '<fileName>' not uptodate. Cannot merge. (Changes in working directory)
- error: Entry '<fileName>' would be overwritten by merge. Cannot merge. (Changes staged, but not commited)
Steps toward Resolution:
- git stash save "<Message that describes what is being Saved>" (Stashes away any changes in your staging area and working directory in a separate index.)
- git status ( Verify all changes are staged)
- git stash list (Lists all stash's user has)
- git pull or git merge (Bring in changes from central repository or another branch)
- git stash pop (Will repopulate your changes into your working directory, maybe have to resolve merge conflicts)
Git is unable to resolve a merge/pull
Error Message:
CONFLICT (content): Merge conflict in <fileName> Automatic merge failed; fix conflicts and then commit the result.
Steps toward Resolution:
- git status (Shows all files that are in conflict as unmerged changed in working directory.)
- Resolve Merge confilicts
- git add <files>
- git commit -m "<Informative commit message>"
