@@ -102,13 +102,13 @@ This situation is similar to the fork/merge workflow commonly used with Git: the
* Go to the project page for *Lab 2* at `https://retting.ii.uib.no/USERNAME/inf101.v19.lab2` (*not* the Lab 3 page). Check that your commits appear on the *Commits* sub-page.
* On the overview page, click *(+) Create New... → New merge request*
* On the overview page, in the top menu, click *(+) Create New... → New merge request*
* Select *USERNAME/inf101.v19.lab2* and *master* as the source branch and *USERNAME/inf101.v19.lab3* and *master* as the target branch, and click *Compare branches and continue*.
* Pick a title for your merge request (or use the default); you can also write a description if you'd like (you should do this in real life, but in this case you're the only one who would read it). Click *Submit merge request*.
* On the next page, you can review the merge request. If everything is OK, there will be a green checkmark, and a *Merge* button. Press it to complete the merge (or explore the interface a bit further, and have a little online discussion with yourself first).
* On the next page, you can review the merge request. If everything is OK, there will be a green checkmark, and a *Merge* button. Sometimes, you get some sort of Pipeline error, but this is not a problem for you, so you can just go ahead and press *Merge* to complete the merge (or explore the interface a bit further, and have a little online discussion with yourself first).
* If everything went well, you are now done with Part I, and can proceed to [Part II – Langton's Ant](LAB-3_II_ANT.md).
...
...
@@ -119,11 +119,15 @@ This situation is similar to the fork/merge workflow commonly used with Git: the
## Screenshots
### Step 1: Start
### Step 2: Pick projects and branches
### Step 3: Submit
Sometimes, this looks like this instead:
This is not a problem, just merge using the button
### Step 4: Merge
