Blogging Pubbitch

It's taken me a little googling to find this out, but when a "git rebase" halts because of a merge conflict, the way to deal with it is by manually editing the file, correcting the merge and then doing either a "git add" or "git rm" of the affected file, followed by "git rebase --continue"

It's all so obvious now.