See why Git reports a conflict even when you only added a few lines, and when it merges cleanly, through four short runnable examples.