rerere

    Source: https://git-scm.com/docs/git-rerere

    If you have long lived branches this is helpful to store how to resolve conflicts you’ve solved before.

    Enable 🔗

    git config --global rerere.enabled 1
    

    Clean Up 🔗

    git rerere gc