diff options
| author |  zardoz <zardoz@web> | 2014-05-15 08:56:21 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2014-05-15 08:56:21 +0000 |
| commit | 3585a3be28b5a8f45626c25ef2ea5d4d3a06e886 (patch) | |
| tree | 1bb1b6febb013c67d37b092ad2235710ea31e070 /doc/todo/Expose_auto-merge_for_manual__44___local_merges.mdwn | |
| parent | d086c6599da67e493f376b94ad99972c435012b4 (diff) | |
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. |