Skip to content

Commit

Permalink
Adds instructions for restoring a feature branch from a backup when r…
Browse files Browse the repository at this point in the history
…ebasing goes wrong.
  • Loading branch information
astroDimitrios committed Dec 2, 2024
1 parent 64cb250 commit 352e937
Showing 1 changed file with 20 additions and 0 deletions.
20 changes: 20 additions & 0 deletions episodes/08-rebase.md
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,26 @@ goes wrong during the rebase:
$ git branch add_plot_script.backup
```

If at anytime you want to restore the branch
from your backup switch to the backup:

```bash
$ git switch add_plot_script.backup
```

Delete the branch where rebasing was attempted:

```bash
$ git branch -D add_plot_script
```

Re-create the original branch while still
on the backup branch:

```bash
$ git switch -c add_plot_script
```

:::

We will rebase interactively using the `-i` flag.
Expand Down

0 comments on commit 352e937

Please sign in to comment.