Getting the most out of Git and GitHub
If that doesn't fix it, git.txt contains the phone number of a friend of mine who understands git. Just wait through a few minutes of 'It's really pretty simple, just think of branches as...' and eventually you'll learn the commands that will fix everything.
Forking
Copying Repositories
Activity
https://github.kdc.capitalone.com/tdp-software-craftsmanship/ore-trader-client
Click Fork
In your username
Cloning
Work locally
Copy your Fork's URL
Git clone
Branching
Separate your work
Create a topic branch
Committing
Saving your work
Where are my changes?
git status
git diff
git remote
git pull
git stash
git stash
merge conflicts
git add
A word on commit messages
Good
- Add message parser
- Fix plaintext password bug
- Refactor interest calculator
- Improve image load performance
- Remove redundant toString method
Bad
- Adding some files.
- refactored interest calculator
- Committing this
- Remove redundant toString method from the quicksilver credit card application class
- I improved the performance
Commit messages
More @ whatthecommit.com
git commit
Push
Save your work in the cloud
git push
Pull Request
Getting feedback
Create a Pull Request
Create a Pull Request
Squash your commits
Squash your commits
Squash your commits
Rewording
Rewording
Rebase Complete
Force Push
Your PR now is upadated
Code Review
Using PRs
Comment on lines
See the conversation
Cool tricks
Share with your team!
Git bisect
How many tries (worst case) will it take to find a commit that introduced a bug in 10,000 commits?
git commit --amend
CAUTION: Don't amend or rebase changes you've already shared in a public repo
git cherry-pick
LGTM integration
Recommended Resources
Git and GitHub
By cof_softwarecraftsmanship
