In this episode of Syntax, Scott and Wes talk about Git fundamentals — what it is, why you need it, best practices, and more!

Sentry - Sponsor

If you want to know what’s happening with your errors, track them with Sentry. Sentry is open-source error tracking that helps developers monitor and fix crashes in real time. Cut your time on error resolution from five hours to five minutes. It works with any language and integrates with dozens of other services. Syntax listeners can get two months for free by visiting Sentry.io and using the coupon code “tastytreat”.

Freshbooks - Sponsor

Get a 30 day free trial of Freshbooks at freshbooks.com/syntax and put SYNTAX in the “How did you hear about us?” section.

Show Notes

03:12 - What is Git?

04:16 - Why do you need it?

06:31 - UI vs command line

09:03 - Commands 101

• https://git-scm.com/

init

• .gitignore file is key right off the bat

add

• add -p - quick review of all the changes you’ve made

commit

• Multiple adds and commits
• Commit messages should be descriptive

push

• What are origins?

pull

clone

checkout

merge

fetch

stash

fork

Merge vs pull request

Git vs GitHub / Alternatives

• Bitbucket
• GitLab

44:25 - Common issues

• Merge conflicts
• Files being tracked unintentionally
• “How do I delete file from GitHub?”
  • git rm -r
  • alias gri="git ls-files --ignored --exclude-standard | xargs -0 git rm -r"
• Databases in Git?

49:10 - Git clients

• https://git-scm.com/downloads/guis

CLI

“Hub”

Github CLI

GitHub desktop app

VS Code integration

Source tree

Kraken

Tower

Links

• VS Code

GitLens

GitHub

Bitbucket

GitLab

Drupal

GitKraken

Tower

××× SIIIIICK ××× PIIIICKS ×××

• Scott: What Had Happened Was Podcast

Wes: Yeti Products

Shameless Plugs

• Scott: React For Everybody - Sign up for the year and save 25%!
• Wes: Master Gatsby - Use the coupon code ‘Syntax’ for $10 off!

Tweet us your tasty treats!

• Scott’s Instagram

LevelUpTutorials Instagram

Wes’ Instagram

Wes’ Twitter

Wes’ Facebook

Scott’s Twitter

Make sure to include @SyntaxFM in your tweets