Home

Welcome to the RatDevGitTut wiki!

How to make a pull request:

Go to "pull request" tab and click on "new pull request"
Add what you want to merge and click "create pull request"
Two people must review your code in order for it to be eligible to be merged into master because master should always contain our "current final draft".
- To review someone's code:
  - Go into "pull requests" tab and then "files changed" and approve
Go into your local repository
git checkout master
git checkout <branch name>
git merge master
There may be a conflict!
- If there is:
  - Resolve your conflict by editing the file that has the conflict
git add <filename>
git status (to check the status and see if the file is modified)
git commit (do :q after)
git push
Go to GitHub into your pull request and click "merge"