Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Celebration

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root

Avatar

1 badge earned

Collect

Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!

Challenges
Coins

Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.

Recognition
Ribbon

Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!

Leaderboard

Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,455,816
Community Members
 
Community Events
176
Community Groups

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

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

0 votes

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

Atlassian Community Events