News for hackers. Stuff that matters.
Re:Select ’Hello, World’: Serverless Postgres Built for the ... by throwaway892238 on Thursday June 16, 2022 @09:59AM (#31766125)
But the manual intervention of conflict resolution in a Git repo is done in a working tree. The named branch's HEAD remains the same until the conflict has been resolved and the commit is merged/pushed. So nobody sees the conflict at all, they only ever see either the old code, or the merged resolved code.

There are no comments on this comment yet.