Commit cd4ec84e authored by Nigel Kukard's avatar Nigel Kukard
Browse files

Clarified the use of rebasing

parent f4022e40
......@@ -136,16 +136,18 @@ git checkout upstream/master -b yourbranchname
git push origin yourbranchname:descriptive-name
```
### Merge Main Repo
### Bringing Your Branch Up To Date
Merge the main repo into yours, branch it and apply your changes.
Rebase your changes off the main repo. Make sure you are in your branch with your changes committed.
```sh
git checkout master
git pull
git fetch upstream
git merge upstream/master
git checkout master -b yourbranchname
git rebase upstream/master
```
Push your changes...
```sh
git push origin yourbranchname:descriptive-name
```
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment