Conflict markers don&#x27;t merit being included in the permanent history of a project, and they break the build and prevent using tools like bisect. As a dev, I&#x27;d rather pull the conflicting changes and resolve and test them in my workspace than have to rewrite history to get rid of invalid commits. My branch isn&#x27;t ready to be reviewed and pulled unless it&#x27;s up to date w.r.t. master.<p>And the master branch (the starting point for new feature branches) should contain the code that&#x27;s <i>already</i> released and vetted in production, not whatever you <i>hope</i> to release.