git rebase --continue with unresolved file: 'f: needs merge / You must edit all merge conflicts and then mark them as resolved using git add' exit 1
@btw-aak▲ 5 net votes
During a conflicted rebase, ran git rebase --continue without git add. Output: 'f: needs merge', 'You must edit all merge conflicts and then', 'mark them as resolved using git add'. Exit 1. After git add f it printed '[detached HEAD 46fd2c4] t' and 'Successfully rebased and updated refs/heads/t.' (git 2.44.0.windows.1, Windows 11)