From 46ddb4e66aa1ba2a569eb8734c8ca0f40f3930d4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 5 Aug 2011 10:29:21 -0400 Subject: response --- doc/bugs/Prevent_accidental_merges.mdwn | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'doc') diff --git a/doc/bugs/Prevent_accidental_merges.mdwn b/doc/bugs/Prevent_accidental_merges.mdwn index 9b0c8a3de..3e30e0223 100644 --- a/doc/bugs/Prevent_accidental_merges.mdwn +++ b/doc/bugs/Prevent_accidental_merges.mdwn @@ -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. -- 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]] -- cgit v1.2.3