Workshops
/
How-To-Git-Started
Archived
5
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

updated toc

This commit is contained in:
Bastian 2020-01-09 13:54:34 +01:00
parent fa1ae8fa67
commit 249a16c266
1 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
README.md
View File

@ -4,19 +4,19 @@ Table of Contents
* [Table of Contents](#table-of-contents) * [Table of Contents](#table-of-contents)
* [How to Git started](#how-to-git-started) * [How to Git started](#how-to-git-started)
* [Using a GUI](#using-a-gui) * [Using a GUI](#using-a-gui)
* [Learning objectives](#learning-objectives) * [Learning objectives](#learning-objectives)
* [Assignments](#assignments) * [Assignments](#assignments)
* [Assignment 1: Create a repository](#assignment-1-create-a-repository) * [Assignment 1: Create a repository](#assignment-1-create-a-repository)
* [Assignment 2: Your first commit](#assignment-2-your-first-commit) * [Assignment 2: Your first commit](#assignment-2-your-first-commit)
* [Assignment 3: Merge conflicts](#assignment-3-merge-conflicts) * [Assignment 3: Merge conflicts](#assignment-3-merge-conflicts)
* [Assignment 5: Branching](#assignment-5-branching) * [Assignment 5: Branching](#assignment-5-branching)
* [Assignment 6: Merge branches (Or Rebase)](#assignment-6-merge-branches-or-rebase) * [Assignment 6: Merge branches (Or Rebase)](#assignment-6-merge-branches-or-rebase)
* [Assignment 7: Pull requests](#assignment-7-pull-requests) * [Assignment 7: Pull requests](#assignment-7-pull-requests)
* [Assignment 8: Undo / Revert commit](#assignment-8-undo--revert-commit) * [Assignment 8: Undo / Revert commit](#assignment-8-undo--revert-commit)
* [Assignment 9:](#assignment-9) * [Assignment 9:](#assignment-9)
* [Using the terminal](#using-the-terminal) * [Using the terminal](#using-the-terminal)
* [Getting started](#getting-started) * [Getting started](#getting-started)
* [Saving changes](#saving-changes) * [Terminal commands](#terminal-commands)
# How to Git started # How to Git started
@ -29,7 +29,7 @@ For other GUIs check out https://git-scm.com/downloads/guis/
Our remote git server is located at https://git.web.rug.nl/ <br/> Our remote git server is located at https://git.web.rug.nl/ <br/>
You can log in with your usual p-number and password. You can log in with your usual p-number and password.
### Learning objectives ## Learning objectives
- Introduction to VCS - Introduction to VCS
- Create new repository - Create new repository
- Git ignore file - Git ignore file
@ -44,9 +44,9 @@ You can log in with your usual p-number and password.
- Tag - Tag
- Log - Log
### Assignments ## Assignments
#### Assignment 1: Create a repository ### Assignment 1: Create a repository
1. Create your own new repository 1. Create your own new repository
2. Add a .gitignore file 2. Add a .gitignore file
3. Why you would like a gitignore file 3. Why you would like a gitignore file
@ -54,14 +54,14 @@ You can log in with your usual p-number and password.
5. Not pushing environment files 5. Not pushing environment files
6. Add a README 6. Add a README
#### Assignment 2: Your first commit ### Assignment 2: Your first commit
0. Clone repository 0. Clone repository
0. Edit README file 0. Edit README file
0. Create a new file(s) and add information 0. Create a new file(s) and add information
0. Stage README and your file(s) 0. Stage README and your file(s)
0. Commit 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. Go to the How to Git started repository
0. Add factorial.py and fibonacci.py to your repository 0. Add factorial.py and fibonacci.py to your repository
0. Choose a partner 0. Choose a partner
@ -71,7 +71,7 @@ You can log in with your usual p-number and password.
0. Let one of you stage and push the changes 0. Let one of you stage and push the changes
0. Solve the merge conflict 0. Solve the merge conflict
#### Assignment 5: Branching ### Assignment 5: Branching
0. Go to the How to Git started repository 0. Go to the How to Git started repository
0. Add index.html to your shared repository. 0. Add index.html to your shared repository.
0. Let person A create a new branch called header 0. Let person A create a new branch called header
@ -82,7 +82,7 @@ You can log in with your usual p-number and password.
0. Pull the latest changes 0. Pull the latest changes
0. Track the branch of your partner 0. Track the branch of your partner
#### Assignment 6: Merge branches (Or Rebase) ### Assignment 6: Merge branches (Or Rebase)
0. Go to your master branch 0. Go to your master branch
0. Merge it with the header branch 0. Merge it with the header branch
0. Commit the merge 0. Commit the merge
@ -91,7 +91,7 @@ You can log in with your usual p-number and password.
0. Push the changes 0. Push the changes
0. Delete your old branches 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. Let one of you create a new repository (do not add collaborators)
0. Stage and commit a file 0. Stage and commit a file
0. Let the other person fork the repository and clone it 0. Let the other person fork the repository and clone it
@ -100,8 +100,8 @@ You can log in with your usual p-number and password.
0. Let the other approve and merge the request 0. Let the other approve and merge the request
0. Let the other pull the latest changes 0. Let the other pull the latest changes
#### Assignment 8: Undo / Revert commit ### Assignment 8: Undo / Revert commit
#### Assignment 9: ### Assignment 9:
Check the logs Check the logs
@ -129,7 +129,8 @@ Omit --global to set the identity only in this repository.
``` ```
Or you can add an [SSH key](https://help.github.com/en/github/authenticating-to-github/adding-a-new-ssh-key-to-your-github-account) Or you can add an [SSH key](https://help.github.com/en/github/authenticating-to-github/adding-a-new-ssh-key-to-your-github-account)
## Saving changes ### Terminal commands
See changes that have been made See changes that have been made
```shell ```shell
git diff git diff