[How To] Resolve merge conflicts in Git
Article ID: 114 | Rating: Unrated | Last Updated: Fri, Dec 15, 2017 at 1:35 PM
Fixing git merge conflicts
git fetch origin
git pull origin master
git checkout myBranchWithConflicts
git merge FETCH_HEAD
git checkout --ours /file/with/conflicts
// or if you want to keep the other version:
//git checkout --ours /file/with/conflicts
git commit -m "fixing conflict by using my version"
There are no attachments for this article.
There are no comments for this article. Be the first to post a comment.