This commit is contained in:
parent
aad1909b75
commit
d2b3e04f22
1 changed files with 7 additions and 0 deletions
|
@ -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.
|
Loading…
Add table
Add a link
Reference in a new issue