A quick vocab review | |
---|---|
What is a remote? | |
Where do branches live? local vs. origin vs. your local copy of origin | |
What's the difference between " | |
What are integration branches? |
The Seven Golden Rules of git
hygiene
- Thou shalt make a new branch off latest
master
for every ticket. - Thou shalt include a ticket ID in every branch name and every commit.
- Thou shalt always PR.
- Thou shalt always review thy Files Changed.
- Thou shalt never merge thy own Pull Requests.
- Thou shalt delete thy merged branches.
- Thy branches shall be short-lived.
...
1. Thou shalt make a new branch for every ticket.
Make very sure your local copy of master
is up-to-date with origin before branching!
1 ticket = 1 branch: Don't mix work from different issues.
...
And you care about line lengths, grammar, punctuation, and other inane details, then Read Chris Beam's How to Write a Git Commit Message and follow The seven rules of a great commit message.Also for the retentive folks: Always delete (non-integration) branches from GitHub after PR merge.