-
Notifications
You must be signed in to change notification settings - Fork 1
Contributor Guidelines
Luke Schoen edited this page Aug 13, 2017
·
1 revision
- Create GitHub account
- Fork a Peerism repository
- Show Git commands available
git --help - Clone the fork on your local computer
git clone <insert_url>and change into the directory - Add the Peerism repository as an
upstreamto synchronise with the forkgit remote add upstream <insert_url_to_peerism_repository> - Show the remote branches available
git remote -v - Pull latest changes from
masterbranch of remoteupstreamPeerism repository into localmasterbranch:git pull upstream master - Create a Branch
git checkout -b <branch_name> - Show Difference after making code changes
git diff - Add Edits ready to commit
git add --all . - Commit to current branch `git commit -m "<insert_message>"
- Show Git Status
git status - Push changes to your remote fork
git push origin <insert_branch_name> - Create GitHub Pull Request to integrate the branch into the
masterbranch of your origin fork - Create GitHub Pull Request to integrate into the master branch of the upstream Peerism repository
- Switch to
masterbranch on your local computergit checkout master - Pull latest changes from
masterbranch of remoteorigin(fork):git pull origin master - Rebase with remote
upstreamPeerism repositorygit pull --rebase upstream master - Update local branch interactively with latest remote changes
git checkout <insert_branch_name>; git rebase -i master- After resolving each merge conflicts run:
git add <filename>; git rebase --continue - Abort rebasing with:
git rebase --abort
- After resolving each merge conflicts run:
- Write tests and code tasks on Trello Board
- Close-out Issues on Peerism GitHub repository
- Create tasks on Trello Board