forked from Baystation12/Baystation12
-
Notifications
You must be signed in to change notification settings - Fork 28
Git
sabira edited this page Jun 20, 2018
·
4 revisions
Git is a version control system and how we interact with this repository.
- Repository, repo - the thing where the code is kept. The main repo is Baystation12/Baystation12, your fork will be yourname/Baystation12.
- Commit- a thing containing information about what you changed and where, and a message describing those changes
- Push- moving your commits to your repo
- Pull- moving other people's commits to your local copy of the repo
- Branch- different versions of the repo, allowing you to make different changes touching different files without having to commit them all at once
- Pull request - a request that the main repo pull yours, merging your code changes into the master version
- Diff- the visual representation of changes viewable in pull requests, short form of difference
Commit messages should follow a few guidelines:
- The first line is the commit subject line and:
- should be less than 50 characters
- should be imperative, as if you're telling the computer what to do (Add new uniforms, Remove Security, Make changes to jobs file)
- An easy way to tell if you're doing it right is to enter it into the following sentence: If merged, this commit will your subject line
- Every following line makes up the body of the commit message, and should be less than 72 characters long each. This is where you can (optionally) describe why you're making your changes, but you can always do this later on GitHub.
Documentation regarding setting up and using Git.
Making heads or tails of specific GitHub pages, for the uninitiated.
Documentation regarding tools external to DM and Git.
Standards and guidelines regarding commenting, contributor conduct and coding standards.