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

Un wanted SourceTree merges

I've been working in the master branch of a project that is stored on bitbucket using git and I use SourceTree to manage it. 

Yesterday I merged in a branch with the master one, but noticed that there has been merges with other branches prior to my merge. In SourceTree it says that I made the merge. In bitbucket it says that an anonymous user made the merge (strange as it is a private repo). I have absolutely no recollection of the previous merges. 

Is there some kind of automated thing I have missed or anything that could have made this if I haven't ever even clicked on one of the other branches in sourcetree? 

All I ever do is commit, pull changes if any, and push. How should that merge a branch?

1 answer

1 accepted

1 vote
Answer accepted

What I see when I am working with Git (and SourceTree but this is a Git functionality AFAIK) is that a pull from a branch to another branch will create a merge from that branch into this other branch. Might that be your effect that your pulls are those merges?

If I don't overwrite the suggested commit message the default message says something like: Merge branch 'master' of "someremote location" into myBranch.

 

A "pull" is very much a "merge". Specifically, it's a "fetch" plus a "merge".

But you probably shouldn't be "pulling" anything into the master branch aside from the remote version of the same branch.

Right. Now that you mention it I remember that I read some documentation sometime back about fetch and merge :-). I just recalled that from my tests with sourcetree and when learning git I saw the effect in my test projects.

Suggest an answer

Log in or Sign up to answer
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...

914 views 0 9
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