Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Deleted user
0 / 0 points
Next:
badges earned

Your Points Tracker
Challenges
Leaderboard
  • Global
  • Feed

Badge for your thoughts?

You're enrolled in our new beta rewards program. Join our group to get the inside scoop and share your feedback.

Join group
Recognition
Give the gift of kudos
You have 0 kudos available to give
Who do you want to recognize?
Why do you want to recognize them?
Kudos
Great job appreciating your peers!
Check back soon to give more kudos.

Past Kudos Given
No kudos given
You haven't given any kudos yet. Share the love above and you'll see it here.

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

Which is 'mine' and which is 'theirs' with conflicts when finishing release using Sourcetree git flow?

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.

3 answers

"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.

Just to clarify, this is the same regardless of whether you're rebasing or merging. The confusing part is that if you're rebasing, you initiate the operation from the release branch, whereas the merge is initiated from develop.

"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.

This is what we should have!

Like Mike Patton likes this

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). 

 

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Sourcetree

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

3,290 views 4 5
Read article

Community Events

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

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you