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
Community Members
Community Events
Community Groups

when picking a commit to merge into my current branch, are they local or remote commits?

I am in my working local branch

I push my changes into my remote working branch. My local and remote working branches are updated and in the graph, they are located in the same node. 

I rebase to master

I click on the merge button and when I pick a commit to merge into my local master, the commits that are merged into my local master are the ones from my remote or my local working branch?

1 answer

From my understanding, master commits from local, and requires a push to remote.

Thanks for your response. So, that means that I am merging my local working branch into my master branch, right? Unless in command console I explicitly chose to merge my remote working branch into my local master, I will always be merging locals?

I use SourceTree instead of console commands, but the effect is the same.  The merge is to a local branch -- I take a deliberate step when I push any committed changes to remote.

Like Mowai Me likes this

Thanks for your help!!

Like Karl Hansen likes this

Suggest an answer

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

Bug Fix: Sourcetree for Windows authentication error when updating to app password

Hello Sourcetree users!!! With the recent removal of Bitbucket Cloud account passwords for app passwords (please see our Bitbucket Cloud community post for details on why we made this change for se...

61,845 views 127 27
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