Follow the steps below to get acquainted with Git. Some of the commands covered earlier will be useful, but you might need to look them up online for the exact syntax. Please ask one of the Project Chairs if you have any questions.
-
Clone this repo to your local machine
-
Create a new branch with a name of your chosing
-
Push this branch and check that it can be accessed from GitHub
-
Edit HelloWorld.cpp to greet anyone you like
-
Check the status of your branch and note which files were modified
-
Stage the modified files and check the status again. Note how it changed from the previous step
-
Commit your changes and push them
-
Access the repo on GitHub and check that your branch has been updated
-
Wait for one of the projects chairs to change the main branch remotely
-
Checkout the main branch again and pull the changes made
-
Checkout the branch you created again and merge the changes from the main branch
-
Fix the merge conflict that arises (keep the changes you made in step 4)
-
Stage, commit, and push your branch
-
BONUS: Create a pull request to merge your changes to the main branch (on GitHub)