https://github.com/blimmer/1up-git-skills-talk
An engineering lunch and learn talk at Ibotta about Git Best Practices
https://github.com/blimmer/1up-git-skills-talk
Last synced: 12 months ago
JSON representation
An engineering lunch and learn talk at Ibotta about Git Best Practices
- Host: GitHub
- URL: https://github.com/blimmer/1up-git-skills-talk
- Owner: blimmer
- Created: 2015-11-30T00:17:21.000Z (over 10 years ago)
- Default Branch: master
- Last Pushed: 2023-01-18T20:30:44.000Z (over 3 years ago)
- Last Synced: 2025-06-07T13:43:41.830Z (about 1 year ago)
- Language: Ruby
- Size: 5.03 MB
- Stars: 4
- Watchers: 2
- Forks: 1
- Open Issues: 5
-
Metadata Files:
- Readme: README.md
Awesome Lists containing this project
README
# 1-Up Your Git Skills
In this talk, I present the two main schools of thought on git commit history. We also talk in-depth about the three PR merge options in the GitHub interface (merge, squash & merge, rebase & merge) in detail.
This presentation was created with [reveal-ck](https://github.com/jedcn/reveal-ck).
## Slides
You can view the slides [here](https://blimmer.github.io/1up-git-skills-talk), or on [SlideShare](https://www.slideshare.net/BenLimmer/1up-your-git-skills).
## Original Version
This is a revamped version of a talk I gave in 2015. If you want to view that
talk, please check out the [v1 branch](https://github.com/blimmer/1up-git-skills-talk/tree/v1).
The first version walks through a lot more of the specifics of local rebasing and squashing.
If you don't use GitHub, or want to dive deeper on how to squash / rebase locally, check it out.
## Contributing
Found a problem in the slides? Please open a PR or issue!
## Development
If you want to run this project locally:
1. Clone the repo
2. `bundle install`
3. Run `bundle exec reveal-ck generate`
4. Run `bundle exec reveal-ck serve`
5. Visit http://localhost:10000