Getting error when trying to check in via source tree

I got this error when trying to committ changes with SourceTree:

git -c diff.mnemonicprefix=false -c core.quotepath=false push -v --tags --set-upstream origin master:master
Pushing to https://XXXXX@bitbucket.org/XXXXX/XXXXX.git
To https://bitbucket.org/XXXXX/XXXXX.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'https://XXXXX@bitbucket.org/XXXXX/XXXXX.git'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. Check out this branch and integrate the remote changes
hint: (e.g. 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

I'm sure it has something to do with me switching laptops and trying to set up SourceTree on the new laptop.

At this point everything I need is saved off to the remote repository, and I would be happy to just start completely from scratch, with a fresh setup from the remote respository.  Just basically erase everything local, and get it all from the remote source.

Any hints on how to do that?

Thanks.

 

 

2 answers

1 accepted

Accepted Answer
0 votes

Hi Sylvia! As you said everything is saved to the remote and you'd be happy to start on local from scratch, you could do a clean install of SourceTree. The steps are as follows:

  1. Wipe SourceTree preferences
  2. Uninstall SourceTree (if it shows on the App&Features list)
  3. Backup then delete the directory below before proceeding with next step
    • Navigate to C:\Users\<UserName>\AppData\Local and delete SourceTree & SourceTree-Settings folder
    • Navigate to C:\Users\<UserName>\AppData\Local\Atlassian and delete all SourceTree Files/Folder.
  4. Download SourceTree and install it. 

Let us know if you have any questions!

Cheers,

Ana

Worked great - thanks!

Glad to hear that Sylvia :) 

Suggest an answer

Log in or Sign up to answer
Community showcase
Published May 30, 2018 in Sourcetree

Tip from the team: configuring Git or Mercurial in Sourcetree

Supported Platforms macOS Windows To make using Sourcetree as simple yet powerful as possible we embed (bundle) dependencies such as Git, Git LFS, and Mercurial. We strive to keep these...

984 views 2 3
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you