JordiGH on Nostr: npub1upkp7…4tcwy Merge diffs are computed to only show conflicts: In the simple ...
npub1upkp7fd7rc3lrjg23r8gy0wc723vze7mxlx5984ut6zurjzpf5xss4tcwy (npub1upk…tcwy) Merge diffs are computed to only show conflicts:
In the simple case, it's a merge diamond: One base, two children, and then children merged back into a merge commit.
You compute the diffs from base to child 1, and from base to child 2. If those two diffs have no conflict (do not touch the same lines), the merge diff will be empty.
If you had to resolve merge conflicts, you'll see a merge diff.
In the simple case, it's a merge diamond: One base, two children, and then children merged back into a merge commit.
You compute the diffs from base to child 1, and from base to child 2. If those two diffs have no conflict (do not touch the same lines), the merge diff will be empty.
If you had to resolve merge conflicts, you'll see a merge diff.