Merge branch 'develop' into 'master' (5668c144) · Commits · Todor Kondic / courses

Commit 5668c144 authored 5 years ago by Laurent Heirendt

Merge branch 'develop' into 'master'

Regular merge of develop

See merge request R3/school/courses!47

parents 8968c03c 0f9b330e

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

2019/2019-09-24_advancedGitTraining/slides/amend.md 64 additions, 0 deletions

2019/2019-09-24_advancedGitTraining/slides/amend.md
2019/2019-09-24_advancedGitTraining/slides/amendIntro.md 0 additions, 3 deletions

2019/2019-09-24_advancedGitTraining/slides/amendIntro.md
2019/2019-09-24_advancedGitTraining/slides/amendPresentation1.md 0 additions, 13 deletions

...19-09-24_advancedGitTraining/slides/amendPresentation1.md
2019/2019-09-24_advancedGitTraining/slides/amendPresentation2.md 0 additions, 16 deletions

...19-09-24_advancedGitTraining/slides/amendPresentation2.md
2019/2019-09-24_advancedGitTraining/slides/amendPresentation3.md 0 additions, 19 deletions

...19-09-24_advancedGitTraining/slides/amendPresentation3.md
2019/2019-09-24_advancedGitTraining/slides/chPick.md 105 additions, 0 deletions

2019/2019-09-24_advancedGitTraining/slides/chPick.md
2019/2019-09-24_advancedGitTraining/slides/chPickIntro.md 0 additions, 11 deletions

2019/2019-09-24_advancedGitTraining/slides/chPickIntro.md
2019/2019-09-24_advancedGitTraining/slides/chPickPresentation1.md 0 additions, 18 deletions

...9-09-24_advancedGitTraining/slides/chPickPresentation1.md
2019/2019-09-24_advancedGitTraining/slides/chPickPresentation2.md 0 additions, 16 deletions

...9-09-24_advancedGitTraining/slides/chPickPresentation2.md
2019/2019-09-24_advancedGitTraining/slides/conflict.md 124 additions, 0 deletions

2019/2019-09-24_advancedGitTraining/slides/conflict.md
2019/2019-09-24_advancedGitTraining/slides/conflictIntro.md 0 additions, 9 deletions

2019/2019-09-24_advancedGitTraining/slides/conflictIntro.md
2019/2019-09-24_advancedGitTraining/slides/conflictPresentation1.md 0 additions, 27 deletions

...09-24_advancedGitTraining/slides/conflictPresentation1.md
2019/2019-09-24_advancedGitTraining/slides/conflictPresentation2.md 0 additions, 16 deletions

...09-24_advancedGitTraining/slides/conflictPresentation2.md
2019/2019-09-24_advancedGitTraining/slides/conflictPresentation3.md 0 additions, 16 deletions

...09-24_advancedGitTraining/slides/conflictPresentation3.md
2019/2019-09-24_advancedGitTraining/slides/gettingStarted.md 81 additions, 10 deletions

2019/2019-09-24_advancedGitTraining/slides/gettingStarted.md
2019/2019-09-24_advancedGitTraining/slides/headRebase-iIntro.md 0 additions, 7 deletions

...019-09-24_advancedGitTraining/slides/headRebase-iIntro.md
2019/2019-09-24_advancedGitTraining/slides/headRebase-iPresentation.md 0 additions, 5 deletions

...24_advancedGitTraining/slides/headRebase-iPresentation.md
2019/2019-09-24_advancedGitTraining/slides/img/afterRebase.png 0 additions, 0 deletions

...2019-09-24_advancedGitTraining/slides/img/afterRebase.png
2019/2019-09-24_advancedGitTraining/slides/img/beforeRebase.png 0 additions, 0 deletions

...019-09-24_advancedGitTraining/slides/img/beforeRebase.png
2019/2019-09-24_advancedGitTraining/slides/img/cherryPick.png 0 additions, 0 deletions

.../2019-09-24_advancedGitTraining/slides/img/cherryPick.png

with 374 additions and 186 deletions

Please register or to comment