3 ms·
Merges are truly horrible, though. They're a commit with two parents, one of which has no real meaning anymore because it doesn't exist anywhere else. They br
by TomSwirly 5y ago
Merges are truly horrible, though.
They're a commit with two parents, one of which has no real meaning anymore because it doesn't exist anywhere else. They break a lot of tools because of this.
- ric2b 5y ago> one of which has no real meaning anymore because it doesn't exist anywhere else. What do you mean? That's the feature branch, what's the issue?
- joshka 5y agoThe first parent is (generally) main. The second parent is the last commit of a series of commits starting at a commit, sometime in the past on the main branch, followed by all the new commits that represent the feature that is being merged. Merges are horrible, if you don't have a mental model of git that aligns exactly to the above.