Merge your branch locally, delete the branch and pull from upstream.
Cleaning up
Once you don't need branches anymore you can delete them locally and remotely. This is helpful so that you don't end up with a pile of old branches.
Merge Locally
Your pull request has been merged! Your branch was merged into the 'gh-pages' branch of the original on GitHub. You can merge your branch locally, too.
First, move into the branch you want to merge into—in this case, the branch 'gh-pages'.
git checkout gh-pages
Now tell Git what branch you want to merge in—in this case, your feature branch that begins with "add-".
git merge <BRANCHNAME>
Tidy up by deleting your feature branch. Now that it has been merged you don't really need it around.
git branch -d <BRANCHNAME>
You can also delete the branch from your remote on GitHub:
git push <REMOTENAME> --delete <BRANCHNAME>
Pull from Upstream
And last but not least, the original has changed since your pull request was merged—Reporobot added your name to the website! If you pull in these changes from upstream you'll be up to date and have that version too. You can actually see it live as well at: yourusername.github.io/patchwork.
To pull from the original upstream:
git pull upstream gh-pages
Congratulations!
You've created local repositories, remote repositories, worked with a collaborator, pushed, pulled and joined the millions of others developing and enriching open source!
Visit jlord.github.io/patchwork to see your name incorporated! Looking to keep going? Checkout the What Next section on the resources page in this app.
- Merge a branch into current branch
- Change the branch you're working on
- Delete a local branch
- Delete a remote branch
- Pull from a remote branch
git merge <BRANCHNAME>
git checkout <BRANCHNAME>
git branch -d <BRANCHNAME>
git push <REMOTENAME> --delete <BRANCHNAME>
git pull <REMOTENAME> <BRANCHNAME>