Fix Merge Conflicts While Changing Commits During an Interactive Rebase by Chris AchardFix Merge Conflicts While Changing Commits During an Interactive Rebase
egghead