Commit bac1e2ad authored by French, Robert's avatar French, Robert
Browse files

Include merge squash slide in rebasing talk

parent 9df30481
......@@ -31,6 +31,13 @@
<!-- *template: invert -->
## How does rebasing work?
---
## Merge squashing
Don't forget to talk about merge squashing
RTFM: `man git-merge`
---
### A new feature based on old work
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment