Comment by direwolf20

5 hours ago

The recursive merge is about merging branches that already have merges in them, while rerere is about repeating the same merge several times.

0 comments