Update Update Guide authored by Jonathan Jones's avatar Jonathan Jones
...@@ -20,25 +20,19 @@ user@host:~/repo/blocks$ git checkout <branch> ...@@ -20,25 +20,19 @@ user@host:~/repo/blocks$ git checkout <branch>
``` ```
You now have three choices: You now have three choices:
1. Commit the changes to the current branch, because you know you want them 1. Commit the changes to the current branch, because you know you want them:
2. Delete the changes by reverting to the previous commit, because you know you don't want them ``` bash
3. Store the changes locally, because you're not sure if you want them yet user@host:~/repo/blocks$ git commit -am "<commit message>"
user@host:~/repo/blocks$ git push
In case 1, you do: ```
``` bash 2. Delete the changes by reverting to the previous commit, because you know you don't want them:
user@host:~/repo/blocks$ git commit -am "<commit message>" ``` bash
user@host:~/repo/blocks$ git push user@host:~/repo/blocks$ git reset --hard HEAD
``` ```
3. Store the changes locally, because you're not sure if you want them yet:
In case 2, you do: ``` bash
``` bash user@host:~/repo/blocks$ git stash
user@host:~/repo/blocks$ git reset --hard HEAD ```
```
In case 3, you do:
``` bash
user@host:~/repo/blocks$ git stash
```
After doing any of these three things you should be able to check out the branch you want without any issues. After doing any of these three things you should be able to check out the branch you want without any issues.
``` bash ``` bash
... ...
......