From d2b3e04f2211cbb3b3958ac78acfb73e482cb8f0 Mon Sep 17 00:00:00 2001
From: zardoz <zardoz@web>
Date: Thu, 15 May 2014 08:56:21 +0000
Subject: [PATCH]

---
 .../Expose_auto-merge_for_manual__44___local_merges.mdwn   | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 doc/todo/Expose_auto-merge_for_manual__44___local_merges.mdwn

diff --git a/doc/todo/Expose_auto-merge_for_manual__44___local_merges.mdwn b/doc/todo/Expose_auto-merge_for_manual__44___local_merges.mdwn
new file mode 100644
index 0000000000..0224733c3a
--- /dev/null
+++ b/doc/todo/Expose_auto-merge_for_manual__44___local_merges.mdwn
@@ -0,0 +1,7 @@
+The automatic conflict resolution currently seems to only work within
+the context of sync, when merging «synced/foo» into «foo». It would be
+convenient if this functionality were exposed for manual merges
+between local branches.
+
+E.g., one might invoke «git annex merge» or «git annex autoresolve»
+after «git merge» when conflicts are found.