Add merge-conflict marker checks to PR template and contributing guide#8

mdheller merged 1 commit into

mainSourceOS-Linux/sourceos-spec:mainfrom

codex/resolve-merge-conflicts-in-branchSourceOS-Linux/sourceos-spec:codex/resolve-merge-conflicts-in-branchCopy head branch name to clipboard