git pull --rebase - 冲突解决后如何进行

I'm doing git pull --rebase and get a conflict. After I resolve a conflict, git show me that I'm in the middle of a merge. If I was doing a simple merge, I'd just add resolved files to the index and do a manual commit. But since I'm also rebasing how do I proceed to have other commits applied after I've resolved a conflict? and get a conflict.