Related Post: Git Merge Conflicts Must Be Resolved Git Resolve Merge Conflicts Using Theirs Git What Causes Merge Conflicts Git Cancel Merge With Conflicts