About the Pitfalls of Merge Conflicts

Posted on Sat 31 December 2016 in misc View Comments • Tagged with Ada, Software Engineering, Source Control

I do not consider myself a novice software developer. And yet I still have not exceeded the list of things I can learn "the hard way".

Last month I had chance to learn about the dangers of resolving merge conflicts as well as how important is it to do a …

Continue reading