Skip to content

Commit

Permalink
Update merge rebase slides
Browse files Browse the repository at this point in the history
  • Loading branch information
uekerman committed Oct 22, 2024
1 parent 1d3a1b9 commit ec7f1ac
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion 01_version_control/merge_rebase_slides.md
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ We use here:
- Create a merge commit
- Squash and merge
- Rebase and merge
- Look at a PR together, e.g. [PR 2059 from preCICE](https://github.com/precice/precice/pull/2059) (will be closed eventually)
- Look at a PR together, e.g. [PR 2113 from preCICE](https://github.com/precice/precice/pull/2113) (will be closed eventually)
> What do the options do?
Expand Down

0 comments on commit ec7f1ac

Please sign in to comment.