**Julia Evans** @b0rk@jvns.ca · Mar 08, 2024, 16:25

**Julia Evans** @b0rk@jvns.ca · Mar 08, 2024, 16:25

Julia Evans @b0rk@jvns.ca

**Neil Kandalgaonkar** @neilk@xoxo.zone · Mar 08, 2024, 16:36

**Neil Kandalgaonkar** @neilk@xoxo.zone · Mar 08, 2024, 16:36

Neil Kandalgaonkar @neilk@xoxo.zone

@b0rk
> Similarly, the meaning of “ours” and “theirs” are flipped in a merge and rebase.

🤯.

I’ve been advocating rebase over merge for years, but had also concluded I have no idea what “ours” and “theirs” actually mean and now I know why!!

**Esme Povirk** @madewokherd@computerfairi.es · 2024-03-08T16:42:20Z

Esme Povirk @madewokherd@computerfairi.es

@neilk @b0rk Do you have "ours" and "theirs" in your conflict markers? I vaguely remember it being a thing, but I can't get them to show up now.