Hacker News new | ask | show | jobs
by direwolf20 147 days ago
The recursive merge is about merging branches that already have merges in them, while rerere is about repeating the same merge several times.