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

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

suresh.ningappa@mokapos.com May 5, 2019

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
Atlassian Team members are employees working across the company in a wide variety of roles.
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
AUG Leaders

Atlassian Community Events