Suppose I have 2 branches, Branch 1 and Branch 2, and I have made changes to the same file in both branches. Further suppose I have made 2 changes in each file, where Change 1 is to the same line in each file, and Change 2 is to the same line in each file. And finally, I choose Merge. I want Change 1 in Branch 1 to win, and I want Change 2 in Branch 2 to win.
I don't see a way to do this with Sourcetree without calling my External Merge Tool. It seems that the Resolve Conflct options are all or nothing in terms of Mine vs Theirs. Is that correct?
A vulnerability has been published today in regards to Sourcetree for Windows. The goal of this article is to give you a summary of information we have gathered from Atlassian Community as a st...
Connect with like-minded Atlassian users at free events near you!Find an event
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no Community Events near you at the moment.Host an event