I'm using git flow and I finished a release and I have a merge conflict. I'm having a very hard time wrapping my head around which file is 'their's' and which is 'mine'. Ultimately what I want to know is which version of the file is from the 'develop' branch and which is from the 'release' branch.
"Mine" and "theirs" is fundamentally confusing. What if you're merging two branches that you didn't even work on? Then neither is yours. Or what if you're rebasing your own branch? Then they're both yours.
Instead, it would be better to identify the actual commit it's coming from. Commit hash would work. Maybe a branch name can be shown in some cases. Regardless, it's a horrible choice of words.
"Mine" is develop, and "Theirs" is the release (feature, hotfix) branch. You can tell which is which because if you look at the graph, your working copy is in the develop branch, and the release branch is being merged to it. So "mine" is develop. Also it will ask for confirmation and give you the commit id. Branch names would be much better than "mine" and "theirs" though.
This is the most confusing part of sorcetree. Mine and theirs naming are actually confusing and does the opposite of what it means,according to me.
Picking "Resolve using mine" (changes on my branch that I'm merging into) actually results in SourceTree picking the file AS IS on the source branch (the one i'm merging from).
Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...
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