Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root


1 badge earned


Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!


Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.


Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!


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
AUG Leaders

Atlassian Community Events