2026-09-07 14:56 UTC
@wingo@mastodon.social i'm trying to think about what Git's official documentation should say about this situation other than "idk it sucks" haha
Replies (2)
-
@benjamingeer@piaille.fr 2026-09-07 15:01
@b0rk@social.jvns.ca @wingo@mastodon.social Unfortunately "ours" and "theirs" aren't very helpful when both of the branches are mine :)
-
@pointlessone@status.pointless.one 2026-09-08 06:53
@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.