Article in Bitbucket cloud

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.