Hi :gitannex: #git and #gitAnnex crowd. How do I configure git so a `git annex assist` (or the assistant) will *never* stop in a merge conflict? It should just choose one side, I don't care about conflicts.@…
@nobodyinperson@fosstodon.org