On 17 Dec 2011 at 13:59Z, Richard Hartmann wrote: > You merged the branches master and git-annex.
The only merge command I typed was “git annex merge”—surely that should do the right thing? Is a revert, rebase or reset the best way to undo the damage I’ve done here? > As a dirty hack to prevent you from typoing, you can create a > .gitnomerge file with > branch = master > and > branch = git-annex > that way, git will not be able to merge the branches without manual > interaction when you ask it to. Okay thanks for that, I’ll check that file in. S
Description: PGP signature
_______________________________________________ vcs-home mailing list firstname.lastname@example.org http://lists.madduck.net/listinfo/vcs-home