What is the next command to run?
$ git rebase main CONFLICT (content): Merge conflict in api.js # ...fix api.js... $ git add api.js
git rebase --continuegit merge --continuegit rebase --skipgit commit -m "resolve"
--continue commits the resolved step and replays the remaining commits. --skip would drop the conflicting commit instead.