|
|
|
|
|
|
by prodigal_erik
3790 days ago
|
|
|
Conflict markers don'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'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't ready to be reviewed and pulled unless it's up to date w.r.t. master. And the master branch (the starting point for new feature branches) should contain the code that's already released and vetted in production, not whatever you hope to release. |
|
|