Tag Archive for: merge

The 12 Days of Comparisons

It’s the most wonderful time of the year where you re-evaluate how you’re spending that precious time of yours. On these twelve days of comparisons I’m going to clue you in on how to speed up finding…

Automatic Merge Conflict Resolving for git

This post describes how merge conflicts can be automatically resolved using maven POM files as an example. The example related to the dependencies section of…