About to try merging different versions of a file
Merge commit. It took no effort, supposedly because none of the /same lines/ had been modified.