Realized we should probably discuss this a bit: when I merged the appcrit stuff, I did this: git checkout hcayless-appcrit git merge master # this resulted in a conflict, which I fixed, then ran a commit to complete the merge git checkout master git merge --squash hcayless-appcrit # this sets up a merge by pulling all the changes over from the branch and setting up a commit for them # this means that instead of getting all the commits from your branch, you just get one with the results. git commit -m "Merged Critical Apparatus changes into master." git push origin master I don’t really think it’s necessary to import my commit history from the branch, because it’s a) not very interesting and b) it’s still available until we’re done with the branch and delete it. But there’s room for disagreement. This method avoids hairy merges (you might have conflicts at any step and have to go through several rounds of conflict resolution) and results in a cleaner history, but it does mean we then don’t have the full record of how a feature was developed (except in the branch, which eventually will be deleted)…it’s a tossup. What do you all think?