MarkUsProject / Markus / 27063674061 / 2

90%

master: 90%

push

github

Fixed merge commits being incorrectly attributed as latest submission (#7988)

When an instructor cloned a student repo, made a local commit, then merged and
pushed, the merge commit was treated as the latest submission for the student's
files. This inflated late penalties and showed the instructor's name as author.

`entry_changed?` returned true for a merge commit whenever the file differed from
*any* parent — including the instructor's branch that simply didn't have the file
yet. The fix: for merge commits (2+ parents), only return true when the result
differs from *all* parents. If the merged content matches at least one parent the
merge was trivial for that path and should not be counted as a new modification.

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>

1026 of 2230 branches covered (46.01%)

Branch coverage included in aggregate %.

2901 of 4893 relevant lines covered (59.29%)

220.25 hits per line