The Atlassian Community Forums are currently in read-only mode. We will be relaunching on a new platform on September 22 (read more here). We apologize for the extended downtime. For concerns or questions, please email communitymanagers@atlassian.com. See you on the other side, on the new Atlassian Community Forums! :)

×

Forums

Articles
Create
cancel
Showing results for 
Search instead for 
Did you mean: 

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

Mowai Me
March 30, 2022

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

Comments for this post are closed

Community moderators have prevented the ability to post new answers.

Post a new question

0 votes
Karl Hansen
March 31, 2022

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

Mowai Me
April 6, 2022

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?

Karl Hansen
April 7, 2022

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
Mowai Me
April 15, 2022

Thanks for your help!!

Like Karl Hansen likes this
TAGS
AUG Leaders

Atlassian Community Events