diff options
Diffstat (limited to 'doc/todo/Expose_auto-merge_for_manual__44___local_merges.mdwn')
-rw-r--r-- | doc/todo/Expose_auto-merge_for_manual__44___local_merges.mdwn | 7 |
1 files changed, 7 insertions, 0 deletions
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 000000000..0224733c3 --- /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. |