Note: I created a local branch on my main rig named proj2, thinking I hadn't made a proj2 branch yet. I had. When I went to push (what I thought was a new branch), git failed, citing that the push failed because there was work in the remote proj2 branch that I didn't have locally. I then did a git pull origin proj2, and automerge failed because the README failed. I fixed the merge conflict, committed this change, and pushed to origin again. This time, it worked. The gitk log shows two legs feeding into the 'Derp. Forgot I had already...' commit. I expect this commit to continue as the only leg from this point on.