Understanding Git with Ben Chatelain

In this episode, Leo talks with Ben Chatelain about Git. They chat about branching strategies, merging strategies, Xcode headaches, and... using emojis in your commit messages!???

We talk about...
0:00 Version Control Intro
9:01 Branching Strategies
17:30 Merging Strategies
26:00 Dependency Management
38:30 Xcode Tips and Tricks
46:45 Commit Messages and Gitmoji

Empower Apps
Episode 65
October 10, 2020

* [Ben Chatelain (@phatblat)](https://twitter.com/phatblat)
* [Github @phatblat](https://github.com/phatblat) - for great commit message examples!
* [?Some Cool DJ Sets ?](https://www.twitch.tv/phatblat)
### Related Episodes
* [Episode 29 - Managing iOS Development with Peter Witham](https://share.transistor.fm/s/4011273d)
* [Episode 46 - Developer Community (Part 2) with Dave Verwer](https://share.transistor.fm/s/e38854fe)
* [Episode 64 - A Very Remote Year with Jacob Gorban](https://share.transistor.fm/s/2445da70)
### Related Links
* [A Brief History of Version Control : Codemash by Brian Meeker](https://www.pluralsight.com/courses/codemash-session-96)
* [MS Visual SourceSafe ?](https://en.wikipedia.org/wiki/Microsoft_Visual_SourceSafe)
* [CVS ?](https://en.wikipedia.org/wiki/Concurrent_Versions_System)
* [Level up Your Git Commits with Gitmoji! ](https://www.youtube.com/watch?v=rCrzDaiMP4M&list=PLnD_TKDSaFyVd00l0Py7LnIZxpyF9jeYj&index=14)
* [Tower](https://www.git-tower.com/mac)
* [Pro Git Book](https://git-scm.com/book/en/v2)
* [Gitflow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow)
* [Trunk Based Development](https://trunkbaseddevelopment.com/)
* [mas](https://github.com/mas-cli/mas) - A simple command line interface for the Mac App Store
* [Dangit, Git!?!](https://dangitgit.com/en)
* `git log -g` (a better reflog)
* Tip: *always delete topic branches after merging a PR (or have )* [GitHub do it for you](https://docs.github.com/en/free-pro-team@latest/github/administering-a-repository/managing-the-automatic-deletion-of-branches)
* Ben’s git shortcuts as [fish shell functions](https://github.com/search?q=git+repo%3Aphatblat%2Fdotfiles+extension%3Afish&type=Code&ref=advsearch&l=&l=)
### Sponsors
[AppFigures](https://appfigures.com/account/upgrade?p=empower3030)
[ [Try Appfigures for free, and if you like it use the special link to get 30% off for the next 3 months:](https://appfigures.com/account/upgrade?p=empower3030) https://appfigures.com/account/upgrade?p=empower3030](https://appfigures.com/account/upgrade?p=empower3030)

[Transistor.Fm](https://transistor.fm/?via=empowerapps)
Try it today with [ this special link:](https://transistor.fm/?via=empowerapps)
[https://transistor.fm/?via=empowerapps](https://transistor.fm/?via=empowerapps)
### Git Tips and Tricks
* Know the Git Terminal Command
* What Xcode can help with
* How Tower Helps
* Gitflow vs Trunk Based
* What are the different ways to branch
* merge vs squash vs rebase
* Dealing with Git Submodules ?
* Merging Xcode Projects and Storyboards ?
* Creating great commit messages
### Git Terminology
* How is a Pull Request useful
* How Branches work in Git
* How to use Tags in Git
* What is a Pull Request draft?
* What is a Git Stash?
* What is Gitmoji?
### Social Media
**Email**
[email protected]
[GitHub - @brightdigit](https://github.com/brightdigit)

[Twitter ](https://twitter.com/brightdigit)
[BrightDigit - @brightdigit](https://twitter.com/brightdigit)
[Leo - @leogdion](https://twitter.com/leogdion)

[LinkedIn](https://www.linkedin.com/company/bright-digit)
[BrightDigit](https://www.linkedin.com/company/bright-digit)
[Leo](https://www.linkedin.com/in/leogdion/)

[Instagram - @brightdigit](https://www.instagram.com/brightdigit/)
[Patreon - empowerappshow](https://www.patreon.com/empowerappsshow)
### Credits
[Music from https://filmmusic.io](https://filmmusic.io/)
[“Blippy Trance” by Kevin MacLeod (https://incompetech.com)](https://incompetech.com/)
[License: CC BY (http://creativecommons.org/licenses/by/4.0/)](http://creativecommons.org/licenses/by/4.0/)

★ Episode details: https://share.transistor.fm/s/8226bebf
★ Additional episodes: https://www.empowerapps.show