loading...

Discussion on: How To Avoid Merge Conflicts

jessekphillips profile image
Jesse Phillips

I also would not generally recommend those commands for resolution during a merge multiple conflicts can occur and which side you desire changes based on the conflict, and this ignores a common desire to accurately merge the two changes.