From 86bd90053bf744915c14f3b4fcaf592aca00a296 Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Sat, 20 Jul 2013 20:03:20 +0000 Subject: [PATCH] Added a comment --- .../comment_10_a4b93a3fbc98d9b86e942f95e0039862._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/safely_dropping_git-annex_history/comment_10_a4b93a3fbc98d9b86e942f95e0039862._comment diff --git a/doc/forum/safely_dropping_git-annex_history/comment_10_a4b93a3fbc98d9b86e942f95e0039862._comment b/doc/forum/safely_dropping_git-annex_history/comment_10_a4b93a3fbc98d9b86e942f95e0039862._comment new file mode 100644 index 0000000000..b24a058f6c --- /dev/null +++ b/doc/forum/safely_dropping_git-annex_history/comment_10_a4b93a3fbc98d9b86e942f95e0039862._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.154.0.140" + subject="comment 10" + date="2013-07-20T20:03:20Z" + content=""" +Since you seem to have found a way that works, I'm only answering for completeness: To resolve a conflicted merge on the git-annex branch, you can just add all lines present in either side of the merge, in any order. This won't necessarily be the most minimal resolution, but it is guaranteed to always be a valid one. There is a git-union-merge program in the git-annex source (not built by default) that can do that when merging any set of branches. +"""]]