Tutorial: do not use 'git resolve'.