On: Resistance Against Git Merge Hell (2015)

[GrantMoyer]

I think they must have been cherry picking changes into production. Git merge might choke on the duplicate changes, but git rebase will usually see the change from each cherry pick is already applied and skip it.