Clean up a fork and restart it from the upstream

Question

I have forked a repository, then I made some changes and it looks like I\'ve messed up everything.

I wish to start it again from scratch, using the current upstrea

Answer 1

How to do it 100% through the Sourcetree GUI

(Not everyone likes doing things through the git command line interface)

Once this has been set up, you only need to do steps 7-13 from then on.

Fetch > checkout master branch > reset to their master > Push changes to server

Steps

1. In the menu toolbar at the top of the screen: "Repository" > "Repository settings"

2. "Add"

3. Go back to GitHub and copy the clone URL.

4. Paste the url into the "URL / Path" field then give it a name that makes sense. I called it "master". Do not check the "Default remote" checkbox. You will not be able to push directly to this repository.

5. Press "OK" and you should see it appear in your list of repositories now.

6. Press "OK" again and you should see it appear in your list of "Remotes".

7. Click the "Fetch" button (top left of the Source tree header area)

8. Make sure the "Fetch from all remotes" checkbox is checked and press "ok"

9. Double click on your "master" branch to check it out if it is not checked out already.

10. Find the commit that you want to reset to, if you called the repo "master" you will most likely want to find the commit with the "master/master" tag on it.

11. Right click on the commit > "Reset current branch to this commit".

12. In the dialog, set the "Using mode:" field to "Hard - discard all working copy changes" then press "OK" (make sure to put any changes that you don't want to lose onto a separate branch first).

13. Click the "Push" button (top left of the Source tree header area) to upload the changes to your copy of the repo.

Your Done!