Commit a71c26e8 authored by Martin Pokorný's avatar Martin Pokorný
Browse files

Merge branch 'add_criteria' into 'main' 

Add criteria of completing, dates and restrictions.

See merge request red-hat/mastering-git!84
parents 4526a5af 8acbd2a8

README.md

+16 −2
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ We have one seminar group open. 
* **Lecture room**: FI MU S505 Red Hat lab at Faculty of Informatics, Masaryk University (S505, note that the room is only available during lecture time)  

* **Grading**: HW + Project completed

* **ECTS Credits**: 3

* **Dates of lectures**: Every week on Tuesday from 17.2.2026 to 7.4.2026 (No forseen exceptions) -- 8 weeks in total

* **Attendance**: Required in person attendance. One lecture can be missed without reason.



## Prerequisites

* Be comfortable in a command-line environment.
@@ -60,7 +62,12 @@ We have one seminar group open. 


## Homeworks



Every homework needs to be completed correctly and will be required to repeat it until done correctly.

Every homework should be done latest 2 weeks after it has been assigned.

Not succesfuly completing the homework in time might require additional work. Doing so repeatedly will result in failure of the course.



**HW0 - Prepare git**

Lesson 1 - Lesson 3



* Download Git  

* Log in to faculty GitLab
@@ -68,6 +75,7 @@ We have one seminar group open. 
* Git config: username, email, editor, etc.



**HW1 – Initial Fork & Contribution**

Lesson 2 - Lesson 4



* Fork the upstream repository  

* Clone your fork locally
@@ -81,6 +89,7 @@ We have one seminar group open. 
* Teacher merges all PRs after reviews pass



**HW2 – Second Entry & Review Cycle**

Lesson 3 - Lesson 5



* Sync your fork with upstream (now contains all students' files)  

* Create feature branch: `git switch -c hw2-second-entry`
@@ -91,6 +100,7 @@ We have one seminar group open. 
* Teacher will comment, but will **not** merge



**HW3 – Controlled Conflict Resolution**

Lesson 4 - Lesson 6



* **Instructor prep**: Instructor directly edits every student's file in upstream, creating conflicts  

* Merge upstream into your main branch
@@ -100,6 +110,7 @@ We have one seminar group open. 
* Teacher merges after verifying proper resolution



**HW4 – CI Pipeline Integration**

Lesson 5 - Lesson 7



* **Instructor prep**: Instructor adds GitLab CI/CD workflow with intentional validation bugs  

* Students sync fork; pipeline fails on their branch
@@ -108,6 +119,7 @@ We have one seminar group open. 
* PR to upstream



**HW5 – GitLab CI/CD**

Lesson 6 - Lesson 8



* Create your own repo on GitLab (or equivalent)  

* Set up GitLab on the repo and create at least one action that will react to a PR in some meaningful way (run “tests,” write a comment, etc.)
@@ -116,6 +128,8 @@ We have one seminar group open. 


### Project



Assigned latest on 7th lecture.



Your group has been tasked with writing a blog post about...  the Git course you are currently taking! (Wow, ground-breaking, we know.)



The goal is to move beyond individual commands and work together as a real-world development team.