mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Browse source
This commit is contained in:
zardoz 2014-05-15 08:56:21 +00:00 • committed by admin
parent aad1909b75
commit d2b3e04f22
1 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
doc/todo/Expose_auto-merge_for_manual__44___local_merges.mdwn Normal file
View file

@ -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.