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

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

Avatar

1 badge earned

Collect

Participate in fun challenges

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

Challenges
Coins

Gift kudos to your peers

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

Recognition
Ribbon

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!

Leaderboard

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
4,463,473
Community Members
 
Community Events
176
Community Groups

AutoCommit Message saying "Merge branch 'X' of URL into X " after rebasing from source tree

Please help me to avoid this commit message  Merge branch 'X' of URL into X when I do rebase by following steps 

  1. Current branch X checked out and Right click on Develop branch --> clicked on Rebase current changes onto develop
  2. Started resolving conflicts and Continue rebase from to bar Action. 
  3. At end of rebase I got A-Ahead and B-Behind
  4. I resolved A-Ahead and B-Behind by first pull and push
  5. When I pull and push automatically the commit message added to current branch
    Merge branch 'X' of URL into X. 


    Why the message merge even though I am doing rebase?

1 answer

0 votes
bgannin Atlassian Team May 16, 2019

Hi suresh.ningappa@mokapos.com,

This isn't specified by Sourcetree, it's coming from Git. It sounds like the branch might be out of sync and pushing causes it to be resolved with a merge (this is often how out of sync issues are resolved in a rebase)

Brian Ganninger
Principal Developer, Sourcetree

Suggest an answer

Log in or Sign up to answer
TAGS

Atlassian Community Events