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

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

SourceTree always rebasing.

I'm using SourceTree for Windows, v1.5.2.0.

SourceTree is always rebasing when I do a git pull. The option "Rebase instead of merge" is not marked on both pull options and git options.

It seems that the only way to merge is doing a fetch and a merge. Am I missing something?

3 answers

1 accepted

0 votes
Answer accepted

How do you know it is rebasing and not fast-forwarding?

Hmm I thought it is rebasing because it never allows me to do it when I have uncommitted changes, I always have to stash them before, while merging normally allows me to do it while having changes. But now I'm confused about this. I normally work with more than one thing at the same time so I always have uncommitted changes, it's a pain to stash, pull, apply stash.

Rebase, fast-forward, and merge have nothing to do with uncommitted changes. You rightly need to clear those out of the way before performing those operations. In some situations, it may be more appropriate to commit them than to stash them.

If you have any commits that have not been pushed, then a pull will need to either merge (default) or rebase. If you don't have any new commits, a pull will attempt to fast-forward (default) unless you explicitly tell it not to, in which case it will create a new merge commit.

Have the same problem. Each time I try to pull I'm getting the error message "Cannot pull with rebase: you have unstaged changes.".

The checkbox "Use rebase instead of merge" is unchecked.

Here the Sourcetree log:

git -c diff.mnemonicprefix=false -c core.quotepath=false -c credential.helper=sourcetree pull --no-commit origin master
error: Cannot pull with rebase: You have unstaged changes.

"git pull --no-rebase" in the shell works.

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Sourcetree

Sourcetree for Windows - CVE-2019-11582 - Remote Code Execution vulnerability

A vulnerability has been published today in regards to Sourcetree for Windows.  The goal of this article is to give you a summary of information we have gathered from Atlassian Community as a st...

5,240 views 0 12
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