On Fri, Dec 16, 2011 at 23:47, Sean Whitton <s...@silentflame.com> wrote:
> After a recent pull/annex merge/push I noticed that my git-annex’d dir
> is filled with three character hex named folders, which contain more
> such folders, which contain log files named after my annex’d files (I
You merged the branches master and git-annex.
As a dirty hack to prevent you from typoing, you can create a
.gitnomerge file with
branch = master
branch = git-annex
that way, git will not be able to merge the branches without manual
interaction when you ask it to.
PS: I still think this should be part of git-annex proper.
vcs-home mailing list