And yeah, this is a human error, not a tool error. I typically `rebase` my branches before submitting them, which will flag any merge conflicts. Then I resolve them manually, never automatically.