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 | 9 |
1 files changed, 0 insertions, 9 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 deleted file mode 100644 index c2cf26f83..000000000 --- a/doc/todo/Expose_auto-merge_for_manual__44___local_merges.mdwn +++ /dev/null @@ -1,9 +0,0 @@ -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. - -> [[done]] as resolvemerge. --[[Joey]] |