Git basics
Alberto López 😎
Frontend Developer @
@earthlandto
Talk goals
- Explain basic concepts
- Help with first-steps
- Help with further learning
- As many dog gifs as I can
I think i can fly
Help you track changes you make in your code over time. As you edit to your code, you tell the version control system to take a snapshot of your files. The version control system saves that snapshot permanently.
- Visual code documentation
Good things 👌
- Lots of people working on the same code
- Fine grained control changes
- Stores your code: history of Who did What and When!
- Prevents heart attacks. Developer safety net
Bad things 🙏
- Scary for new users
- Big learning curve
- Conflicts
Terminal rules
(with oh-my-zsh)
Flow level #0:
auto-love
git init
git add + git status + git commit
git init
git commit -m "add greetings"
git commit -m "add new file"
git log
git checkout file_name
git reset
Flow level #1:
we love branches
git checkout -b new_branch
- Split features
- Select branch to merge
git checkout -b new_branch
git merge
Warning: Conflicts!
git diff branch_name
Flow level #2:
remote love
git clone https://repo-url
git fetch
git pull
git push -u origin branch_name
git push
the end
Things we didn't talk about
- .gitignore
- git help
- HEAD concept
- git add -i
- git stash
- origin concept
- git rebase
- git bisect
- git cherry-pick
- git revert
- git rebase -i
- staging directory
- fast-forward
- github
- pull-request
- git reflog
- git branch -d
- git commit --amend
- ...
Things you should check out 📚
git end --questions ?
Thank u 🙇🏻
Git basics