I don't understand the problem here, why didn't he just do a merge and resolve the 18 conflicts by using the version of the file from master? And the problem w

I don't understand the problem here, why didn't he just do a merge and resolve the 18 conflicts by using the version of the file from master? And the problem wasn't in checkout-add-commit, that is a trivial issue, the WTF here is producing 406 new commits in a branch without ever thinking of merging master back into it or rebasing on master, to avoid having a giant merge later.