Git rerere is a feature that records and automatically reapplies conflict resolutions. When enabled, it captures the state of a file before a conflict and the resolved state after a human intervenes. The next time the same conflict occurs, rerere automatically applies the previously recorded resolution, saving engineers time and effort, especially in scenarios involving frequent rebasing or long-lived feature branches.
All Atlassian trails