Skip to content
Snippets Groups Projects
Commit 3c05119b authored by Laurent Heirendt's avatar Laurent Heirendt :airplane:
Browse files

Merge branch 'minor-changes-advanced-siu' into 'develop'

add ignore to index and fix url

See merge request R3/school/courses!54
parents 0d64d35a ec92f8c0
No related branches found
No related tags found
No related merge requests found
......@@ -11,7 +11,7 @@
```bash
$ cd advanced-git-practice
# add upstream URL
$ git remote add upstream git@github.com:<first.last>/advanced-git-practice.git
$ git remote add upstream git@github.com:LCSB-BioCore/advanced-git-practice.git
$ git fetch upstream
```
* Check the remotes with:
......
......@@ -2,16 +2,18 @@
1. Installation and getting started
2. Amend last commit
2. Ignoring files
3. Resetting to a previous commit
3. Amend last commit
4. Reverting commits
4. Resetting to a previous commit
5. Rebasing in Git
5. Reverting commits
6. Git cherry-picking
6. Rebasing in Git
7. Merging branches
7. Git cherry-picking
8. Conflict Resolution
8. Merging branches
9. Conflict Resolution
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment