$ ./guess_the_languageGit
Git · easy · #22

What is the next command to run?

$ git rebase main
CONFLICT (content): Merge conflict in api.js
# ...fix api.js...
$ git add api.js
  1. git rebase --continue
  2. git merge --continue
  3. git rebase --skip
  4. git commit -m "resolve"
--continue commits the resolved step and replays the remaining commits. --skip would drop the conflicting commit instead.
Play Git ▸