logoalt Hacker News

KPGv2yesterday at 10:55 PM1 replyview on HN

> ours means what is in my local codebase

Since it's always one person doing a merge, why isn't it "mine" instead of "ours"? There aren't five of us at my computer collaboratively merging in a PR. There is one person doing it.

"Ours" makes it sound like some branch everyone who's working on the repo already has access to, not the active branch on my machine.


Replies

itintheorytoday at 12:21 AM

That's between you and git.