Related Post: Git Merge Conflictstyle Git Merge.conflictstyle Diff3 Git Config Merge Conflictstyle Git Merge Not Merging Git Merge Theirs Example Git Merge Example Git Merge Without Deleting Branch