Always surprises me that so many software developers accept to not really understand merge conflicts. Yes it can be confusing, but come on people ! You deal with confusing things all day long, why not work to clarify that one ?

#softwareDeveloment #versionControl #softwareCraftsmanship