Sean Whitton wrote:
> The only merge command I typed was “git annex merge”—surely that should
> do the right thing?

git-annex merge can't do this, but git merge git-annex certianly could..

> Is a revert, rebase or reset the best way to undo the damage I’ve done
> here?

Yes.

-- 
see shy jo

Attachment: signature.asc
Description: Digital signature

_______________________________________________
vcs-home mailing list
vcs-home@lists.madduck.net
http://lists.madduck.net/listinfo/vcs-home

Reply via email to