https://github.com/MichaelMure/git-bug/blob/v0.8.0/doc/model... should answers all those question. In short: merge conflict are handled.