News for hackers. Stuff that matters.
Re:Git Branches: Intuition and Reality by jillesvangurp on Saturday November 25, 2023 @02:34PM (#38415956)
It still uses the notion of a common parent to merge a single commit. Works as long as there are no conflicts. As to why that would or would not work, I refer to the git internals section of the Git book. Great stuff. But they are not performing any dark magic here.
Re:Git Branches: Intuition and Reality by cassianoleal on Tuesday November 28, 2023 @05:03AM (#38444206)
So are you saying that if I have completely disconnected commit trees in the same repo, git will refuse to cherry-pick between each other?