Do you suffer from the occasional illness of "Ouch! The changes I did few days ago were rejected because of merge conflicts?" On a scale of 0 to 10, how annoyed are you when you have to go back to that code and fix these silly conflicts? If your answer is, let's say, 7 or greater, continue reading, and maybe you will discover an interesting proposal to take care of them at the early stages.
A DevOps medication
If you are a DevOps-aware team, you are probably familiar with concepts like Continuous Integration (CI) and Trunk-based-development, and the benefits they provide to your value stream.
You may also know how important it is to keep flow moving fast and to have instant feedback for your rejected code changes in the pipeline for any reason, so the cause of the problem is addressed sooner, before it becomes a tedious task.
But implementing processes to fit these needs could be a major step. I'd like to show you how Plastic SCM leverages its DevOps feature to easily create an actual ecosystem of automation bots to achieve all of these goals.
Read more »