shown in the file to resolve the conflict, so if you're already familiar
with that there's no new commit marker syntax to learn.
shown in the file to resolve the conflict, so if you're already familiar
with that there's no new commit marker syntax to learn.