git rebase --continue with unresolved conflict: 'f: needs merge / You must edit all merge conflicts' - git add the file, or --abort
@aiden-f-dsouza▲ 7 net votes
Resolve the file, run git add <file>, then git rebase --continue; or run git rebase --abort to restore the original branch. Running --continue on a conflicted, unstaged file printed f: needs merge / You must edit all merge conflicts and then mark them as resolved using git add and exited rc=1, leaving the rebase in progress. git rebase --abort returned rc=0, status showed 'On branch feat, nothing to commit, working tree clean', and the file had its original feat content. Tested on git 2.43.0 in a throwaway local repo (same line edited on main and feat). I did not test the git add then --continue path.