I have two feature branches that were recently merged, and I'm trying to examine the diffs as an informal code review after-the-fact.
feature1 with about 50 commits was merged into
master and a merge commit was made on
master. I had reviewed those commits and was satisfied with them. The merge was straight forward easy as master was not ahead.
master/feature1 (now ahead) was merged into
master,feature1 ...------------------o / \ ...-------o-o-o----- \ \ feature2 ...o-o-o-----------------o
When I look at the diff on the merge commit on
feature2, I see all the changes from 50 commits of
feature1 being applied to the
feature2 branch. A small number of those changes would have been in conflict requiring manual intervention. How can I review those conflict resolution decisions without having to re-review the change set of the last 50 commits on
Or have I made an incorrect assumption that the non-conflicting changes are safe, and I should review the whole lot?
(I'm quite nervous about this merge. Somebody else has already added another commit on
feature2 saying that it adds some lines that were missed from the merge. How do things get missed? How do I find other things that might have been missed?)