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

Sourcetree Merge Conflict Flow has Changed for the Worse

I'm an artist. For years, I have had the habit of always Pulling before I Commit/Push. Till recently, I would Pull and if there was an incoming merge conflict, the Merge Conflict popup would show up and then I would have an opportunity to right-click the conflicted file and resolve it. Again, all without Committing first.

Now it seems like Sourcetree has changed and it expects me to Commit BEFORE Pulling. Says so in the popup.

WHY has this changed? And is there a way to put it back how it was? I would rather have an opportunity to Reset my file before Committing it, if I don't want to Resolve. And for an artist, un-committing requires a command line.

1 answer

0 votes
Mike Corsaro Atlassian Team Oct 09, 2019

Hello! Which OS are you using?

 

We enforce this behavior because the docs actually warn about this topic:

Warning: Running git merge with non-trivial uncommitted changes is discouraged: while possible, it may leave you in a state that is hard to back out of in the case of a conflict.

 

Due to this, I'd advise that you actually do the following:

  • Stash your changes before the merge
  • Merge the changes. Now your 'base' is up to date with the remote and there won't be any conflicts
  • Apply the stash: now it's easy to see what your changes are on top of the newly updated base
  • Resolve the conflicts and commit. It's a good idea to also delete the stash if you'd like.

 

For un-committing: you can right-click the commit in the History view and select "Reverse commit".

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,289 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