Especially relevant because Starlink has been causing numerous near-collisions over the past few years.
64 karma · joined February 20, 2023
Especially relevant because Starlink has been causing numerous near-collisions over the past few years.
This breaks down during rebase, where the terminology gets reversed. The definitions are more accurately:
- "Ours" refers to "the branch whose HEAD will be the 1st parent of the merge commit" (during merge) or "the branch who will get commits applied on top of its HEAD" (during rebase)
- "Theirs" refers to "the branch whose HEAD will be the 2nd parent of the merge commit" (during merge) or "the branch whose commits will be applied on top of the other branch" (during rebase)
This gets a little more complicated during "octopus merges", where there are multiple "theirs" branches.
Now, if certain extensions try to get your attention with notifications or automatically opening release notes, that can absolutely be a problem. Extensions vary wildly in quality, since the barrier for publishing one is effectively nothing. These leaves the job of curating good, non-spammy extensions up to the developer.