Commit 5266b88e authored by Jane Bar's avatar Jane Bar Committed by Tomas Tomecek
Browse files

fix

parent 97d5d0ab
Loading
Loading
Loading
Loading
+8 −18
Original line number Diff line number Diff line
@@ -12,19 +12,19 @@
4. Clone your fork to your local machine:

```bash
git clone TBD
git clone git@gitlab.com:${USER}/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 git@gitlab.com:redhat/research/mastering-git.git
```

Now, your fork has two remotes: "origin" (your fork) and "upstream" (the original repository).
@@ -34,7 +34,7 @@ Now, your fork has two remotes: "origin" (your fork) and "upstream" (the origina
7. Create a new branch for your contribution:

```bash
git checkout -b <do-not-name-this-my-contribution>
git switch -c <do-not-name-this-my-contribution>
```

#### Step 4: Open autumn2023.md and write down what’s the most valuable thing you learnt so far on this course
@@ -50,29 +50,19 @@ 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 -u
git commit -m "Resolve $THE_RPOBLEM"
```

11. Push the changes to your fork:

```bash
git push origin
git push -u 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.
Navigate to gitlab.com and follow the steps there to create a new merge request against the upstream repo main branch.


## Conclusion