git Retroactive Rerere Thanks to some sick Git magic, I was able to save a PR. rerere replays successful conflict resolutions in other branches. It has to be enabled with a config setting: git config --global