How do I merge new Sourcetree install with existing local files & bitbucket?

I recently had to rebuild my workstation.  The backups of my htdocs are fine and they match the files on bitbucket.  How do I mesh the two back together?  What are the steps?

Sorry if I am not using the correct terminology. 

2 answers

1 accepted

1 vote
Accepted answer

In the Sourcetree "Add Repository" dialog, use the "Add Working Copy" tab. That will add an existing local repository to SourceTree.

If that doesn't work, make sure that your htdocs backup includes a .git folder. If it does not, then you only backed up your working copy, not your whole repo, and you'll need to re-clone from bitbucket.

Thanks Seth.  I had problems with this in the past, apparently it was because the .git folder was missing.  Apparently I got lucky this time.

Suggest an answer

Log in or Sign up to answer
Community showcase
Published Oct 23, 2018 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...

735 views 3 2
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