Closed neoneye closed 3 years ago
Please resolve the merge conflicts (you can also use git -X theirs merge ...
git -X theirs merge ...
Please resolve the merge conflicts (you can also use
git -X theirs merge ...