4 ms·
I find merges more confusing than rebasing. At the end of rebasing you just have commits. Merges are commits with multiple parents, which is a confusing concept
by stevebmark 2y ago
I find merges more confusing than rebasing. At the end of rebasing you just have commits. Merges are commits with multiple parents, which is a confusing concept.
- account42 2y agoMerges are also dangerous because they can contain arbitrary changes (a commit is just a tree state with parent references but the tree state can be anything) but no one ever looks at the merge commit changes themselves.