The conflicts shown in the article are generally solved by rebasing and are not any different from a merge conflict. If the changes which caused them represent

The conflicts shown in the article are generally solved by rebasing and are not any different from a merge conflict. If the changes which caused them represent divergences in genuinely separate histories, then a merge makes sense. >It's better to merge often and rarely if ever allow two branches to even have "divergent or unrelated histories". Remember that git is distributed, not just nominally but also in workflow.