Ok, it looks like I'm still doing something wrong: https://github.com/systemed/potlatch2/pull/25 I only wanted to include one commit in the pull request, not 9. Is the idea that I keep rewinding my local repository back to the current master before making any change? Or is there some trick with rebase, to avoid this situation? Steve