Presenting with Decker

Git and GitLab

Achievements 🏆

GitLab registration

• 🥉 Register at the institute’s user portal for IT services
• 🥉 Login at the institute’s GitLab service (will be named just GitLab in the following)
• 🥉 Create a GitLab project or navigate to your GitLab project
• 🥉 Upload a file to the Git repository via GitLab’s web interface (will be named just your repository in the following)
• 🥉 Create a test.md file in your repository via GitLab’s web interface

Install Git and SmartGit

• 🥇 Install Git on your PC
• 🥈 Install and setup SmartGit on your PC (Hint: On Lab PCs you can find it in the SoftwareCenter)
  • Request a Non-Commercial License for SmartGit or add this license (💡This may take up to 3 days.)
  • Save your license to your J: drive
• 🥈 Set up Git LFS for your local account

First commit

• 🥈 Clone your repository with HTTPS
• 🥉 Create a new file first_commit.md
• 🥉 Add and commit the new file
• 🥉 Push the file to gitlab

Git with SSH

• 🥇 Create an SSH key.
• 🥇 Add the SSH key to your GitLab account.
• 🥇 Clone your repository with SSH.
• 🥇 Push a file to your repository using SSH.

Create first branch

• 🥉 Create a local branch
• 🥉 Change the branch to master/main
• 🥉 Change the file first_commit.md
• 🥇 Switch to your branch and merge the master local into your branch
• 🥇 Create a new file in your branch and push it to GitLab
• 🥈 Create a merge request on GitLab for your branch and accept it
• 🥈 Delete your local branch

Merge conflict (requires 2 persons)

• 🥇 Intentionally create and resolve a conflict in your Readme.md
• 🥇 Inspect your Readme.md adaption and conflict resolution in your repository’s log
• 🥇 Create and resolve a merge conflict on GitLab

GitLab Issues

• 🥉 Create an issue and give it an assignee as well as a due date
• 🥉 Move an issue to Doing using the issue board
• 🥉 Take a look at the GitLab wiki and add a page
• 🥉 Star your GitLab project

Materials

Installation of Git / SmartGit

• Softwarecenter for Uni PCs
• SmartGit Non-Commercial License

Uni GitLab

• User Portal of the CS Institute
• GitLab Service of the CS Institute

Git Guides

• Best Git Practices
• More (partly overlapping) Best Git Practices
• Git’s workflow
• Git Branch
• Ignoring files with Git (.gitignore)
• Git’s Large File Storage (LFS, .gitattribute)
• Codecademy Git Tutorial
• Interactive Git (Console) Tutorial
• Mini Tutorials presented by Use Case
• Git Cheat Sheet
• Advanced Best Git Practices

SmartGit Guides

• SmartGit Documentation
• SmartGit - Main Window

SmartGit Alternatives

• Alternative Graphical Git Clients
• Alternative SmartGit Tutorial (Solo and Team) showcased in this Video
• Alternative Git (Console) Tutorial (Git and GitLab E-Learning Tutorial)
• Alternative Git (Console) Tutorial (Git-Tower)
• Alternative Git (Console) Tutorial (GitHub.io)

The German video below can also be watched with English subtitles. To do this, you must activate subtitles and select a language available to you. Afterwards you have the possibility to generate subtitles in different languages automatically under “Settings”.