Mid Version Control You manually edit and resolve the conflict.? Add the resolved file: git add <file> git commit # or continue the rebase