And general notes on working with other humans.
git push -u origin branchName(push new branch--short for
git pull origin master, no matter what branch you're in, will pull and merge master into your current branch. so, do
git pull <remote name> <branch name>
git stashto push changes to temp thing before pulling, then
git stash popto throw those back over after you pull, so it's basically a kind of automerge. Then you can go ahead and do your merge in depth.
git merge feature-branch.
I guess not really a whole lot of notes. Oh well.