2 ms·
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 t
by jillesvangurp 3y ago
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.
- cassianoleal 3y agoSo are you saying that if I have completely disconnected commit trees in the same repo, git will refuse to cherry-pick between each other?