mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

response

Browse source
This commit is contained in:
Joey Hess 2011-08-05 10:29:21 -04:00
parent 3211c6e335
commit 46ddb4e66a
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
doc/bugs/Prevent_accidental_merges.mdwn
View file

@ -7,3 +7,8 @@ Adding a tiny binary file called .gitnomerge to both branches would solve that w
Yes, there is an argument to be made that this is too much hand-holding, but I still think it's worth it. Yes, there is an argument to be made that this is too much hand-holding, but I still think it's worth it.
-- Richard -- Richard
> It should be as easy to undo such an accidential merge
> as it is to undo any other git commit, right? I quite like that git-annex
> no longer adds any clutter to the master branch, and would be reluctant
> to change that. --[[Joey]]