Article
in Bitbucket
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.
Join over 150,000 working professionals
Get the latest research and insights on AI, teamwork, and more.