Related Post: Git Rebase Conflicts Use Theirs Git Merge Conflicts Use Theirs Git Merge Conflict Use Theirs One File Git Merge Conflict Use Theirs Command Line Git Merge Conflict Accept Theirs Command Line Eclipse Git Merge Conflict Use Theirs