News for hackers. Stuff that matters.
Re:Why SQLite Does Not Use Git by YZF on Sunday April 15, 2018 @08:15PM (#16845806)
What I like about merges it that it shows you how the conflicts were resolved. You can see the two versions and the resolved and you can validate it was resolved properly. With a rebase workflow you see the resolutions as if nothing else existed, you can't tell the difference between an intentional change and a bad resolution...

There are no comments on this comment yet.