forked from Workshops/How-To-Git-Started
Add header to assignments
This commit is contained in:
parent
3011604c72
commit
76026da0d1
20
README.md
20
README.md
@ -25,7 +25,8 @@ You can log in with your p-number as password.
|
||||
- Log
|
||||
|
||||
### Assignments
|
||||
Assignment 1: Create a repository
|
||||
|
||||
#### Assignment 1: Create a repository
|
||||
1. Create your own new repository
|
||||
2. Add a .gitignore file
|
||||
3. Why you would like a gitignore file
|
||||
@ -33,14 +34,14 @@ Assignment 1: Create a repository
|
||||
5. Not pushing environment files
|
||||
6. Add a README
|
||||
|
||||
Assignment 2: Your first commit
|
||||
#### Assignment 2: Your first commit
|
||||
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
|
||||
#### Assignment 3: Merge conflicts
|
||||
0. Go to the How to Git started repository
|
||||
0. Add factorial.py and fibonacci.py to your repository
|
||||
0. Choose a partner
|
||||
@ -50,7 +51,7 @@ Assignment 3: Merge conflicts
|
||||
0. Let one of you stage and push the changes
|
||||
0. Solve the merge conflict
|
||||
|
||||
Assignment 5: Branching
|
||||
#### Assignment 5: Branching
|
||||
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
|
||||
@ -61,7 +62,7 @@ Assignment 5: Branching
|
||||
0. Pull the latest changes
|
||||
0. Track the branch of your partner
|
||||
|
||||
Assignment 6: Merge branches
|
||||
#### Assignment 6: Merge branches (Or Rebase)
|
||||
0. Go to your master branch
|
||||
0. Merge it with the header branch
|
||||
0. Commit the merge
|
||||
@ -70,7 +71,7 @@ Assignment 6: Merge branches
|
||||
0. Push the changes
|
||||
0. Delete your old branches
|
||||
|
||||
Assignment 7: Pull requests
|
||||
#### Assignment 7: Pull requests
|
||||
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
|
||||
@ -79,14 +80,11 @@ Assignment 7: Pull requests
|
||||
0. Let the other approve and merge the request
|
||||
0. Let the other pull the latest changes
|
||||
|
||||
Assignment 8: Undo commit
|
||||
|
||||
|
||||
#### Assignment 8: Undo commit
|
||||
#### Assignment 9:
|
||||
Check the logs
|
||||
|
||||
|
||||
|
||||
|
||||
## Using the terminal
|
||||
|
||||
### Getting started
|
||||
|
Loading…
Reference in New Issue
Block a user