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

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

0 votes
Answer accepted
Ana Retamal Ortiz Atlassian Team Aug 16, 2017

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

0 votes

Worked great - thanks!

Ana Retamal Ortiz Atlassian Team Aug 17, 2017

Glad to hear that Sylvia :) 

Suggest an answer

Log in or Sign up to answer
This widget could not be displayed.
This widget could not be displayed.
Community showcase
Posted in Sourcetree

[dev team] Sourcetree for Windows 2019 Preview - Dark Theme

Hi folks, While the full post is over on our blog I'd like to share the dark theme we've got planned for 2019 here directly as well to keep the discussion going.  The ...

1,891 views 14 18
Join discussion

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