Move conflicted commit detection from headers to commit message markers#13247

Byron merged 3 commits intomastergitbutlerapp/gitbutler:masterfrom

is-conflicted-refactorgitbutlerapp/gitbutler:is-conflicted-refactorCopy head branch name to clipboard