Try git rebase --continue and then check is it working or not. It will be better if you provide some snapshots
git rebase --continue