From f737ede24bedae34e8458200a6bb696d5c31f910 Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Wed, 26 Mar 2014 18:56:30 +0000 Subject: [PATCH] Added a comment --- ...comment_5_00ac9e4a47ce9a886dbf573480f151bd._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/automatic_conflict_resolution/comment_5_00ac9e4a47ce9a886dbf573480f151bd._comment diff --git a/doc/automatic_conflict_resolution/comment_5_00ac9e4a47ce9a886dbf573480f151bd._comment b/doc/automatic_conflict_resolution/comment_5_00ac9e4a47ce9a886dbf573480f151bd._comment new file mode 100644 index 0000000000..4d1e7c4bcd --- /dev/null +++ b/doc/automatic_conflict_resolution/comment_5_00ac9e4a47ce9a886dbf573480f151bd._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="209.250.56.41" + subject="comment 5" + date="2014-03-26T18:56:30Z" + content=""" +@Matthias you need to install git-annex 4.20130709 or newer. Then `git-annex merge` will do what you want. As I said before. + +As for committing the merge, you can always adjust the result after the fact and use `git commit --amend`. +"""]]