Version control

General / Useful

Create a new branch: git checkout -b new-branch

Switch to a different branch: git checkout name-of-branch

Delete an old branch: git branch -d some-branch

Merge your commits into current branch (i.e. production): git merge staging

Merge a specific commit: git cherry-pick d4d8e7c

Check the remote URL for the repo: git remote -v

Merge conflicts

Abort merge: git merge --abort

Manually bring in the changes from one branch to the current branch: git checkout [branch-name] path/to/file.txt

Git Scenarios

Checkout these (opens new window). Checkout... Get it... 😄

You can't git any funnier 😂