@b0rk@social.jvns.ca @wingo@mastodon.social git merge docs don't even explicitly define what "theirs” and “ours” mean. It sort of implied that “ours” is current brunch and “theirs” is what's being merged. And it kind makes sense but also it doesn't say what is being merged where when you're presented with a merge conflict.