bing9 / jadspdeng-gittutorial

In this repository JADS PDEng students can experiment with the use of Git and GitHub

JADSPDEng-GitTutorial

In this repository JADS PDEng students can experiment with the use of Git and GitHub.

Prerequisites

1. Installed version of Git Bash
2. An account on GitHub

Assignments:

1. Become a contributor to an open source project by making a pull request. Check the CONTRIBUTING.md to check how to do this! Note that your pull request will be accepted by me if your name is added to the list below.

2. Using Git and GitHub is not solving all your troubles. Sometimes your pull request will generate a Merge Conflict.

   • Make a new branch on top of your local copy's master branch by

   git checkout -b <your-initals>_favo_nickname

   • Change the line with your name to your favorite nickname in the contributors list
   • Add and commit the changes
   • Make a second branch, again on top of your local copy's master branch by

   git checkout -b <your-initals>_favo_nickname

   • Change the line with your name to a nickname you don't like, add and commit the changes
   • Run git merge <your-initals>_hatefull_nickname what will happen now? Can you solve it?
   • If solved, push the changes to your forked repository and make a pull request again!

Contributors

• Thomas Castelijns (Maintainer account)
• Thomas Castelijns (Enexis)

References and learning resources

• JADS PDEng Kaggle repository
• Basics
• Branching
• Forking
• GitHub cheat sheet
• Interactive
• Udacity Course Git
• Udacity Course GitHub
• Create merge conflict