path: root/doc/forum/controlling_how___34__git_annex_sync__34___resolves_conflicts/comment_2_c091e5a668b15aca7b2faa955beab403._comment

[[!comment format=mdwn
 username="joey"
 subject="""comment 2"""
 date="2017-06-01T16:16:44Z"
 content="""
I've implemented the annex.automerge configuration setting, for the next
release. There's also a `git annex sync --no-resolvemerge`
"""]]