Merge pull request #197 from NETWAYS/release/v3-0-0

Release v3.0.0

Author: martialblog

_images/mermaid/central-vcs.mmd

@@ -1,6 +1,6 @@
 graph RL
     subgraph CentralVCS
-    C{{Version DB}}
+    C{{VersionDB}}
     end
     C -->|Client A| D[File]
     C -->|Client B| E[File]

_images/mermaid/central-vcs.mmd.png

@@ -1,6 +1,6 @@
 graph RL
     subgraph CentralVCS
-    C{{Version DB}}
+    C{{VersionDB}}
     end
     C <--> A
     C <--> B

_images/mermaid/decentral-vcs.mmd

@@ -12,7 +12,7 @@
 
 !SLIDE smbullets
 # Training Virtual Machine / Notebook
-* Base OS is CentOS 7
+* Base OS is CentOS
   * Password-less sudo is configured
   * Git and terminal integrations are installed
 
@@ -42,7 +42,7 @@
 
 Click on the link in your email to join the session
 
-* Operating system is CentOS 7
+* Operating system is CentOS
 * We use tmux to join your session and help you
 * Change the appearance of the terminal as you like
 

_images/mermaid/decentral-vcs.mmd.png

@@ -25,8 +25,7 @@ there are open source and enterprise hosting options available.
 
 NETWAYS also provides GitLab hosting services:
 
-* https://www.netways.de/managed_hosting/gitlab_ce_hosting/
-* https://nws.netways.de/products/gitlab-ce
+* https://nws.netways.de/de/apps/gitlab/
 
 ~~~ENDSECTION~~~
 !SLIDE smbullets

day1/00_Organisation/01_Intro.md

@@ -10,9 +10,7 @@ system.
 * Merge, review, report
 * Continuous integration/deployment (CI/CD)
 
-Hosted: https://www.netways.de/managed_hosting/gitlab_ce_hosting/
-
-NWS: https://nws.netways.de/products/gitlab-ce
+NWS: https://nws.netways.de/de/apps/gitlab/
 
 ~~~SECTION:handouts~~~
 
@@ -46,7 +44,6 @@ https://about.gitlab.com/install/ce-or-ee/
 ****
 
 Overview: https://about.gitlab.com/features/
-Comparison: https://about.gitlab.com/images/feature_page/gitlab-features.pdf
 
 The source code is publicly available for both editions.
 You'll need a valid license for running EE in production.

day1/06_Server/01_Intro.md

@@ -28,13 +28,11 @@ in GitLab.
 * New GitLab repository for this user
 * Configure local repository for the remote server
 
-
-
 ~~~SECTION:handouts~~~
 
 ****
 
-# SSH Keys
+**SSH Keys**
 
 Generate a new SSH key pair on your client.
 
@@ -136,16 +134,26 @@ the changes to the Git repository.
 * Steps
  * Open the project in GitLab and extract the `HTTPS` clone URL
  * Navigate into your local repository in `$HOME/training`
- * Use `git remote add origin <remoteurl>`
- * Push your local branch with `--set-upstream` (short: `-u`)
+ * Use `git remote add origin <https-remote-url>`
+ * Push local branches with `git push -u origin --all`
+
 * Bonus
  * Set default push method to `simple`
- * Explain what `git push -u origin --all` does suggested by GitLab
 
 ~~~SECTION:handouts~~~
 
 ****
 
+There are various `push` methods:
+
+* `simple` - pushes the current branch with the same name on the remote
+* `current` - push the current branch to update a branch with the same name on the receiving end
+* `nothing` - do not push anything (error out) unless a refspec is given
+
+References:
+
+https://git-scm.com/docs/git-config/#Documentation/git-config.txt-pushdefault
+
 
 ~~~ENDSECTION~~~
 
@@ -163,16 +171,14 @@ the changes to the Git repository.
 
 * Open the project in GitLab and extract the `HTTPS` clone URL
 * Navigate into your local repository
-* Use `git remote add origin <remoteurl>`
-* Push your local branch
-* Use `--set-upstream` (short: `-u`) to enable the local branch tracking the remote repository 
+ * Use `git remote add origin <https-remote-url>`
+* Push local branches with `git push -u origin --all`
 
 ## Bonus:
 
 ****
 
 * Configure the default push method to `simple`
-* Explain what `git push -u origin --all` does suggested by GitLab
 
 !SLIDE supplemental solutions
 # Lab ~~~SECTION:MAJOR~~~.~~~SECTION:MINOR~~~: Proposed Solution
@@ -198,7 +204,9 @@ This will not work since the local branch does not follow the remote branch.
 Use `--set-upstream` as proposed by the cli output. Short form is `-u`.
 
     @@@ Sh
-    $ git push --set-upstream origin main
+    $ cd $HOME/training.git
+    $ git remote add origin https://[...].nws.netways.de/root/training.git
+    $ git push -u origin --all
 
 ### Set default push method
 

day1/06_Server/02_Gitlab_Introduction.md

@@ -1,4 +1,4 @@
-!SLIDE subsection noprint
+!SLIDE subsectionnonum noprint
 # ~~~SECTION:MAJOR~~~ Repetition
 
 

day1/06_Server/04_Connect_Local_Remote.md

@@ -83,8 +83,8 @@ Remote Repository
 !SLIDE smbullets
 # Centralized Workflow - Merge Conflicts
 
-* Conflicts arise when the same lines in a file have changed
 * When merging Git will try to automatically integrate new changes
+* Conflicts arise when the same lines in a file have changed
 * Git cannot automatically determine what is correct
   * `>>>` marks conflicts and show the differences
   * `===` is the barrier between the two states
@@ -114,7 +114,7 @@ Example:
 * Steps:
  * Open the GitLab project `training`
  * Open `README.md` using the Gitlab Web IDE
- * Edit `README.md`, add `This change is from my colleague.`
+ * Edit `README.md`, add `This change is on the remote.`
  * Stage & commit the change to main
 * Local steps:
  * Change into `training` directory on your local machine
@@ -233,15 +233,13 @@ in a non-fast forward fashion is not allowed.
 ****
 Instead of `git fetch` and `git rebase` you can also use
 the `git pull` command with the additional `--rebase` flag.
-This helps if you are familiar with SVN and `svn update`.
 
 If you forget the `--rebase` flag it will still work
 but generate merge commits. This will merge your commits
 in historical order but not rebase them on top of the existing
 history.
 
-For using a centralized workflow it is better to use `rebase`
-instead of generating a merge commit.
+When using a centralized workflow it is generally better to use `rebase`.
 
 ~~~ENDSECTION~~~
 

day2/00_Repetition/01_Intro.md

@@ -49,7 +49,7 @@ Example:
 
 ****
 
-# Forking Workflow - Keep in Sync
+**Forking Workflow - Keep in Sync**
 
 * Pull changes from `upstream` HEAD to own repository main branch to sync development
 * Remote `HEAD` is the default branch for this repository, usually `main`

day2/01_Workflows/02_Centralized.md

@@ -12,9 +12,13 @@
 
 ****
 
-* Eclipse egit: http://www.eclipse.org/egit/
-* vim-fugitive: https://github.com/tpope/vim-fugitive
-* emacs-magit: https://magit.vc/
+References:
+
+Eclipse egit: http://www.eclipse.org/egit/
+
+vim-fugitive: https://github.com/tpope/vim-fugitive
+
+emacs-magit: https://magit.vc/
 
 ~~~ENDSECTION~~~
 
@@ -40,7 +44,9 @@
 
 ****
 
-Reference: https://www.jetbrains.com/help/idea/using-git-integration.html
+Reference:
+
+https://www.jetbrains.com/help/idea/using-git-integration.html
 
 ~~~ENDSECTION~~~
 
@@ -67,8 +73,9 @@ Reference: https://www.jetbrains.com/help/idea/using-git-integration.html
 
 References:
 
-* https://docs.microsoft.com/en-us/vsts/git/gitquickstart?tabs=visual-studio
-* https://visualstudio.github.com/
+https://docs.microsoft.com/en-us/vsts/git/gitquickstart?tabs=visual-studio
+
+https://visualstudio.github.com/
 
 
 ~~~ENDSECTION~~~

day2/01_Workflows/06_Github_Flow.md

@@ -56,7 +56,8 @@ Official GitLab Slack integration: https://gitlab.com/gitlab-org/gitlab-ce/blob/
 
 Both Rocket.Chat and GitLab are available at NWS:
 
-* https://nws.netways.de/products/gitlab-ce
-* https://nws.netways.de/products/rocket-chat
+https://nws.netways.de/products/gitlab-ce
+
+https://nws.netways.de/products/rocket-chat
 
 ~~~ENDSECTION~~~