packages feed

git-annex-4.20131024: doc/forum/A_really_stupid_question.mdwn

Sorry, but all this wiki and the manpage seem to gloss over the most obvious question:

What happens when you commit conflicting edits in different repositories?