Skip to content
This repository was archived by the owner on Apr 28, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 0 additions & 41 deletions day2/03_CI/02_Travis_CI.md

This file was deleted.

1 change: 1 addition & 0 deletions day2/03_CI/03_Gitlab_CI.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# GitLab CI

* Build Pipelines
* Consists of one or more Jobs
* Natively integrated into GitLab
* Invokes GitLab Runners
* Local container registry for runners
Expand Down
18 changes: 0 additions & 18 deletions day2/04_Gitlab_Hints/01_Intro.md

This file was deleted.

88 changes: 0 additions & 88 deletions day2/04_Gitlab_Hints/03_Administration.md

This file was deleted.

23 changes: 0 additions & 23 deletions day2/04_Gitlab_Hints/04_Monitoring.md

This file was deleted.

21 changes: 0 additions & 21 deletions day2/04_Gitlab_Hints/06_API.md

This file was deleted.

22 changes: 0 additions & 22 deletions day2/04_Gitlab_Hints/07_Applications.md

This file was deleted.

76 changes: 76 additions & 0 deletions day2/04_Summary/01_Summary
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
!SLIDE subsection
# ~~~SECTION:MAJOR~~~ What have we learned?

!SLIDE smbullets
# The basics topics

* Cloning or initializing repositories
* `git clone` or `git init`
* Working directory, staging area, commit
* `git add`, `git rm`, `git commit`
* There is no thing as too much `git status`
* Viewing the history
* `git log`, `git show`, `git diff`

~~~SECTION:handouts~~~

****


~~~ENDSECTION~~~

!SLIDE smbullets
# The advanced topics

* Branching
* `git branch`, `git checkout`
* Remote Repositories
* `git push`, `git fetch`, `git pull`
* Merging and resolving conflics
* `git merge`
* Rebasing and squashing
* `git rebase -i <SHA>`

~~~SECTION:handouts~~~

****


~~~ENDSECTION~~~


!SLIDE smbullets
# git Best Practices

* Set user configuration (name, email)
* Try to write good commit messages
* Do not commit all changes at once - use staging with `git add` and then `git commit`
* Work with branches (features, bugfixes, etc.) whenever possible
* Rebase branches prior to creating a merge request
* Always force a merge commit with `--no-ff` to keep history trees in graphs


~~~SECTION:handouts~~~

****


~~~ENDSECTION~~~

!SLIDE smbullets
# Working with GitLab

* Creating Projects and `git remote`
* Working with Remote Branches
* `git push --force`, `git push origin --delete feature/login`
* Create Milestone and First Issue
* Create Merge Request
* Creating Pipelines with Jobs
* `.gitlab-ci.yml`

~~~SECTION:handouts~~~

****


~~~ENDSECTION~~~
20 changes: 0 additions & 20 deletions day2/05_Git_Hints/01_Intro.md

This file was deleted.

13 changes: 0 additions & 13 deletions day2/05_Git_Hints/02_Hints.md

This file was deleted.

Loading