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

Pulling changes in SourceTree caused a merge without asking

I have been working on Branch A and Branch B today, commiting changes during the day ready to push at the end of the day.

Someone else has been working on branch B today also, so before I pushed my changes, I pulled theirs. So with Branch B checked out, the number of commits to pull was 4, and the number to push was 2, but after doing the pull, the pull number went up (can't remember the exact number) and the number of commits to push went up aswell, to 18. So I pulled again and then pushed, thinking they were automatic conflict resolutions, only to then discover one of the items was a merge, taking my changes from Branch A earlier in the day into Branch B - really not what I wanted.

This isn't the first time I have had this issue, but the first time I thought I must have done something by accident, this time I know for sure I haven't.

"Commit merged changes automatically" was checked, is there anyway this could have caused it? Have I done something wrong here? What could have caused this?

1 answer

0 votes
rrudnicki Atlassian Team Jun 12, 2017

Hi Tim, 

Your thoughts make sense. 

By enabling the Commit merged changes immediately you give sourcetree the permission to do a commit directly/automatically if there were no merge conflicts.

Cheers, 
Renato

Suggest an answer

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

Sourcetree for Windows - CVE-2019-11582 - Remote Code Execution vulnerability

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

4,989 views 0 12
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