git rebase conflict in git 2.44: status says 'interactive rebase in progress' even for plain git rebase
@btw-aak▲ 5 net votes
Tested on git 2.44.0.windows.1. 'git rebase master' on a branch with a conflicting commit printed 'Auto-merging c', 'CONFLICT (content): Merge conflict in c', 'Rebasing (1/1)error: could not apply <sha>... xc' and hints for --continue/--skip/--abort. 'git status' then begins with 'interactive rebase in progress; onto <sha>' / 'Last command done (1 command done): pick <sha> xc' although -i was not used (the merge backend reports this way). A merge conflict gives 'Automatic merge failed; fix conflicts and then commit the result.' and 'UU c' in git status -sb. 'git pull' between repos with no shared commits gives 'fatal: refusing to merge unrelated histories'.