When viewing a merge commit, Fork shows the diff against the first parent, which includes everything brought in by the merged branch. That makes it impossible to see at a glance which lines were the merger's manual conflict resolution (the "evil merge" content) versus which came in cleanly from the second branch.
CLI git solves this two ways:
git diff --cc <merge-sha> — combined diff showing only hunks that differ from both parents. This is what git show defaults to for merge commits.git log --remerge-diff (git 2.36+) — replays the merge and shows exactly where the human deviated from a clean re-merge.
A toggle on the merge-commit diff view — e.g. "Full diff vs first parent" / "Combined (--cc)" / "Remerge diff" — would make merge-commit code review actually viable in Fork. Today this is the one task that drives me back to the CLI.
When viewing a merge commit, Fork shows the diff against the first parent, which includes everything brought in by the merged branch. That makes it impossible to see at a glance which lines were the merger's manual conflict resolution (the "evil merge" content) versus which came in cleanly from the second branch.
CLI git solves this two ways:
git diff --cc <merge-sha>— combined diff showing only hunks that differ from both parents. This is whatgit showdefaults to for merge commits.git log --remerge-diff(git 2.36+) — replays the merge and shows exactly where the human deviated from a clean re-merge.A toggle on the merge-commit diff view — e.g. "Full diff vs first parent" / "Combined (--cc)" / "Remerge diff" — would make merge-commit code review actually viable in Fork. Today this is the one task that drives me back to the CLI.