From f36639f86c7ba133ff62f189b645e610f102f00d Mon Sep 17 00:00:00 2001 From: Bastian Date: Wed, 8 Jan 2020 17:00:26 +0100 Subject: [PATCH] Add numbering to assignments --- README.md | 84 +++++++++++++++++++++++++++---------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/README.md b/README.md index 6b1d646..ca0d326 100644 --- a/README.md +++ b/README.md @@ -9,58 +9,58 @@ For other GUIs check out https://git-scm.com/downloads/guis/ ### Assignments Assignment 1: Create a repository -1 Create your own new repository -2 Add a .gitignore file -3 Why you would like a gitignore file -4 Not pushing sensitive files -5 Not pushing environment files -6 Add a README +1. Create your own new repository +2. Add a .gitignore file +3. Why you would like a gitignore file +4. Not pushing sensitive files +5. Not pushing environment files +6. Add a README Assignment 2: Your first commit -Clone repository -Edit README file -Create a new file(s) and add information -Stage README and your file(s) -Commit README and your file(s) +0. Clone repository +0. Edit README file +0. Create a new file(s) and add information +0. Stage README and your file(s) +0. Commit README and your file(s) Assignment 3: Merge conflicts -Go to the How to Git started repository -Add factorial.py and fibonacci.py to your repository -Choose a partner -Add him/her as a collaborator -Make the partner clone your repository -Let both of you edit the same line in the code file -Let one of you stage and push the changes -Solve the merge conflict +0. Go to the How to Git started repository +0. Add factorial.py and fibonacci.py to your repository +0. Choose a partner +0. Add him/her as a collaborator +0. Make the partner clone your repository +0. Let both of you edit the same line in the code file +0. Let one of you stage and push the changes +0. Solve the merge conflict Assignment 5: Branching -Go to the How to Git started repository -Add index.html to your shared repository. -Let person A create a new branch called header -Let person B create a new branch called footer -Let person A edit the header of index.html -Let person B edit the footer of index.html -Stage and push the changes -Pull the latest changes -Track the branch of your partner +0. Go to the How to Git started repository +0. Add index.html to your shared repository. +0. Let person A create a new branch called header +0. Let person B create a new branch called footer +0. Let person A edit the header of index.html +0. Let person B edit the footer of index.html +0. Stage and push the changes +0. Pull the latest changes +0. Track the branch of your partner Assignment 6: Merge branches -Go to your master branch -Merge it with the header branch -Commit the merge -Merge it with the footer branch -Commit the merge -Push the changes -Delete your old branches +0. Go to your master branch +0. Merge it with the header branch +0. Commit the merge +0. Merge it with the footer branch +0. Commit the merge +0. Push the changes +0. Delete your old branches Assignment 7: Pull requests -Let one of you create a new repository (do not add collaborators) -Stage and commit a file -Let the other person fork the repository and clone it -Let him/her change the file and push it -Let him/her create a new pull request via the GUI -Let the other approve and merge the request -Let the other pull the latest changes +0. Let one of you create a new repository (do not add collaborators) +0. Stage and commit a file +0. Let the other person fork the repository and clone it +0. Let him/her change the file and push it +0. Let him/her create a new pull request via the GUI +0. Let the other approve and merge the request +0. Let the other pull the latest changes Assignment 8: Undo commit