Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Deleted user
0 / 0 points
Next:
badges earned

Your Points Tracker
Challenges
Leaderboard
  • Global
  • Feed

Badge for your thoughts?

You're enrolled in our new beta rewards program. Join our group to get the inside scoop and share your feedback.

Join group
Recognition
Give the gift of kudos
You have 0 kudos available to give
Who do you want to recognize?
Why do you want to recognize them?
Kudos
Great job appreciating your peers!
Check back soon to give more kudos.

Past Kudos Given
No kudos given
You haven't given any kudos yet. Share the love above and you'll see it here.

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

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
Community showcase
Published in Sourcetree

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

3,291 views 4 5
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