merging-branches-git.sh

# So there's stuff on the `v0.10` branch you want to show up on `master`.

# First, get everything up to date locally:

git checkout master
git pull origin master

git checkout v0.10
git pull origin v0.10


# Then merge v0.10 **into** master
git checkout master
git merge v0.10

# If there are merge conflicts, freak out AHHH
# if you're unsure at all, ask for help (it's easy to mess things up-- not irreversibly, but it can suck)
# if you had to resolve anything, commit your changes.

# When everything is cool
git push origin master

# If you want to delete the other branch locally:
git branch -d v0.10
# (it'll prevent you from doing this if there are unmerged changes)

# If you want to delete the other branch on the remote: (CAREFUL)
git push origin :v0.10