Resolving conflicts with git-rerere
Resolving conflicts is never fun so you may as well use rerere to make fixing them easier, and even a bit fun.
As part of the graduation of custom merge checks from open-beta to general availability (GA) that is planned for late-April 2024,…
Resolving conflicts is never fun so you may as well use rerere to make fixing them easier, and even a bit fun.