Skip to content
GitTree
العربية

Video: Continue, skip or abort an active operation

The video plays in YouTube’s player, in privacy-enhanced mode.

When a merge or a rebase stops, you have three ways out: continue, skip or abort. Learn which one fits, what each one throws away, and how to check the repository afterwards.

Read the full lesson

The article has every step and command from the video, the practice exercise and the questions.

Go to the lesson

Video transcript

The narration of the video, cue by cue.

  1. A merge or a rebase stops. You have three ways out.
  2. Continue finishes it. Skip leaves one commit out. Abort goes back.
  3. First, always find out which operation is active.
  4. The banner names it. In a terminal, git status does.
  5. Build Sara's and Omar's branches, and three identical copies.
  6. Same start, three different endings.
  7. Copy one: we continue. Start the merge, and it stops.
  8. Resolve, open the file, and write the combined heading.
  9. Save and Mark Resolved, so Git sees the file as done.
  10. Continue is available now. Choose it once.
  11. Done. The new commit has two parents, and the banner is gone.
  12. Copy two: we abort. Start the same merge.
  13. Leave the conflict alone, and choose Abort.
  14. The dialog explains what comes back, and what is kept first.
  15. The repository is back where it was before.
  16. The branch tip is the same ID, and the page is Sara's again.
  17. Copy three: we skip. This one is a rebase.
  18. Rebase Sara's branch onto Omar's. It stops with a conflict.
  19. Now the banner has a Skip button. A merge never had one.
  20. Skip leaves Sara's commit out of the result. Say that out loud.
  21. Choose Skip once.
  22. The page shows Omar's heading. Sara's branch now sits on his commit.
  23. Skip is not a resolution. It deleted Sara's change from this result.
  24. In the terminal, git status shows what is active, and the commands.
  25. The merge: add the resolved file, then git merge continue.
  26. The abort: the branch tip is the same before and after.
  27. The skip: git rebase skip, and the branch sits on Omar's commit.
  28. In every copy, the status is empty, and nothing is left unmerged.
  29. Change the input: resolve the file, then choose Abort instead.
  30. Your resolution is dropped, after a recovery snapshot is saved.
  31. Never use reset hard to escape. Abort is the safe way out.
  32. If you skipped by mistake, the commit is still in the reflog.
  33. Practice: name the operation, the choice, and the proof, for each copy.
  34. Next, copy a single commit onto another branch with cherry-pick.

All tutorials