You're on your way to the next level! Join the Kudos program to earn points and save your progress.
Level 1: Seed
25 / 150 points
Next: Root
1 badge earned
Challenges come and go, but your rewards stay with you. Do more to earn more!
What goes around comes around! Share the love by gifting kudos to your peers.
Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!
Join now to unlock these features and more
The Atlassian Community can help you and your team get more value out of Atlassian products and practices.
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?
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?
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
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.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.