concepts.md

Pull Requests

Commit your branch

1. (my-feature) git add .
2. (my-feature) git commit -m 'add this feature'
3. (my-feature) git status

Check out master and pull the latest version

4. (my-feature) git checkout master
5. (master) git pull origin master

Check out your branch again and merge

6. (master) git checkout my-feature
7. (my-feature) git merge master

If there's a conflict

8. open editor and resolve conflicts
9. git add .
10. git commit --no-edit # commit using the default commit message

Git Workflow

• 💜 Typical Workflow
  
• good habits when working in a team

Rebase

• Illustration: Git Rebase vs Merge
  
• 💜 What's the difference between 'git merge' and 'git rebase'?
  
• What's the difference between git pull and git pull --rebase
  
• Stop using git pull, use git fetch and git merge instead
  
• git pull --rebase vs --merge
  

Squash

• 💜 What is the difference between merge --squash and rebase?
• How to squash your commits