Commit 2d065595 authored by Tomas Tomecek's avatar Tomas Tomecek
Browse files

update lab 3 for 2025 class

parent 60d891fe
Loading
Loading
Loading
Loading
+2 −5
Original line number Diff line number Diff line
# Lab 3

* Fork this repo
* Fork this repo, if you haven't done so
* Clone your fork and set up origin and upstream remotes properly
* Contribute using a merge request
  * Create a new base branch for the merge request
* Open autumn2023.md and write down what’s the most valuable thing you learnt so far on this course
* Open class3.md and write about a useful git option or an argument you like to use.
* Commit and push to your fork
* Open the merge request
* CI needs to pass

Tutor, do that :) Create an MR that fixes TBD's in this document.
+12 −26
Original line number Diff line number Diff line
@@ -12,37 +12,38 @@
4. Clone your fork to your local machine:

```bash
git clone TBD
git clone git@gitlab.fi.muni.cz:YOUR_PLACE/mastering-git.git
```

5. Change into the cloned directory:

```bash
cd TBD
cd mastering-git
```

6. Add the original repository as the "upstream" remote:

```bash
git remote add upstream TBD
git remote add upstream https://gitlab.fi.muni.cz/red-hat/mastering-git/
```

Now, your fork has two remotes: "origin" (your fork) and "upstream" (the original repository).


#### Step 3: Contribute using a merge request

7. Create a new branch for your contribution:

```bash
git checkout -b <do-not-name-this-my-contribution>
git switch -c <what-should-i-type-here?>
```

#### Step 4: Open autumn2023.md and write down what’s the most valuable thing you learnt so far on this course
#### Step 4: Open class3.md and edit it

9. Write down the most valuable thing you have learned in the course:
9. Write down your favourite option or an argument

```
The most valuable thing I have learned so far in this course is the importance of using version control systems like Git for collaborative software development. Git has allowed me to work on projects more efficiently, collaborate with others, and track changes in the codebase effectively. I now feel more confident in managing projects with Git and using branches, merges, and pull requests to collaborate with other developers.
My favourite...
```

#### Step 5: Commit and push to your fork
@@ -50,8 +51,8 @@ The most valuable thing I have learned so far in this course is the importance o
10. Stage the changes and commit:

```bash
git add autumn2023.md
git commit -m "Added my most valuable lesson"
git add class3.md
git commit -m "what is a good commit message?"
```

11. Push the changes to your fork:
@@ -62,22 +63,7 @@ git push origin

#### Step 6: Open the merge request

TBD


#### Step 7: CI needs to pass

17. Wait for the Continuous Integration (CI) checks to run. The CI system will
    check whether your changes pass all the necessary tests and meet the
    project's requirements.

18. If the CI checks pass successfully, your pull request will be ready for
    review and merge.
Open https://gitlab.fi.muni.cz/red-hat/mastering-git/ and click "Create merge request".


## Conclusion
Congratulations! You have successfully completed the workshop class by forking
a repository, contributing to it via a merge request, and ensuring that the CI
checks pass before merging the changes into the main repository. This workflow
is commonly used in open-source software development projects to encourage
contributions and maintain code quality.
Congratulations!