I need to figure out if there is a way to determine which file was used to resolve a conflict. Mine or theirs during a merge. We have that one guy who always uses theirs to merge and stomps on everyone else's changes. Looking back through the history I can see that there was a conflict but cant seem to find which branch he used to resolve the conflict.
Atlassian Team members are employees working across the company in a wide variety of roles.
March 16, 2018 edited
Hi Paul,
There's no indication of what branch was used from a DVCS perspective that I'm aware of at the moment. The only workaround I can think of is to checkout the mangled branch and in another copy of the repo checkout one of the two merged branches and compare them using your favorite visual diff tool.
Brian Ganninger Senior Mac Developer, Sourcetree
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.