When Git Resolves Changes It Shouldn’t
CRANK
Sometimes, git resolves changes when merging branches that it shouldn’t. This is because Git doesn’t understand the semantics of code. If it did, it would know these changes to be potential conflicts.