Merge Requests

Estimated time: 15 minutes

Overview

Questions

• What are merge requests for?
• How can I make a merge request?

Objectives

• Define the terms fork, clone, origin, remote, upstream
• Understand how to make a merge request and what they are useful for

Callout

Merge requests are a great way to collaborate with others using GitLab. Instead of making changes directly to a repository you can suggest changes to a repo. This can be useful if you don’t have permission to modify a repository directly or you want someone else to review your changes.

On GitLab, in your multiverse repo, click on the “Merge Requests” tab.

Then click “Create merge request”. Alternatively, GitLab will see your new branch with recent changes and will prompt you to create a Merge Request. Click this button to also be taken to the new merge request page.

Make sure that the “base” branch is main and the “compare” branch is heimdall-aware.

Next, we need to give our PR a title. By default, your PR will get the title from your last commit. We can leave this as is.

Click “Compare branches and continue”.

Click “Create merge request”.

Your multiverse repo should now have 1 merge request. This is the phase where you would normally request a reviewer, who can leave comments on your code. In repos that you do not own, your PR will need to be approved by a codeowner before you can merge it. Since you are the codeowner, we can go ahead and click “Merge”. Confirm & complete the merge.

Go back to the “Code” tab and make sure you are on the “main” branch. You should now see an “asgard.txt” file.

Let’s go back to VS Code. Switch to the main branch, and look at the files and history:

BASH

$ git switch main
$ git log --oneline

OUTPUT

2f2d364 (HEAD -> main, origin/main, origin/HEAD) Complete story with Thor-Jane reunion
ee67c8b Implement counterattack strategy
9b26458 Start story for New Asgard in earth.txt
f537d84 Initial commit

The analysis file is not on “main” yet. This is because we need to first pull the changes we made with the Merge Request from the remote repository.

BASH

$ git pull

OUTPUT

remote: Enumerating objects: 1, done.
remote: Counting objects: 100% (1/1), done.
remote: Total 1 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0)
Unpacking objects: 100% (1/1), 952 bytes | 476.00 KiB/s, done.
From https://github.com/loki-god-of-stories/multiverse
   2f2d364..976b48e  main       -> origin/main
Updating 2f2d364..976b48e
Fast-forward
 asgard.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 asgard.txt

$ git log --oneline

OUTPUT

976b48e (HEAD -> main, origin/main, origin/HEAD) Merge pull request #1 from loki-god-of-stories/heimdall-aware
daf95c3 (origin/heimdall-aware, heimdall-aware) Create asgard.txt detailing Heimdall's awareness of invasion
2f2d364 Complete story with Thor-Jane reunion
ee67c8b Implement counterattack strategy
9b26458 Start story for New Asgard in earth.txt
f537d84 Initial commit

Now our main branch is up to date.

Deleting branches

---

Now that we’ve merged the heimdall-aware into main, these changes exist in both branches. This could be confusing in the future if we stumble upon the heimdall-aware branch again.

We can delete our old branches so as to avoid this confusion later. We can do so by adding the -d flag to the git branch command.

BASH

git branch -d heimdall-aware

OUTPUT

Deleted branch heimdall-aware (was daf95c3).

And because we don’t want to keep the changes in the heimdall-blind branch, we can delete the heimdall-blind branch as well

BASH

$ git branch -d heimdall-blind

OUTPUT

error: The branch 'heimdall-blind' is not fully merged.
If you are sure you want to delete it, run 'git branch -D heimdall-blind'.

Since we’ve never merged the changes from the heimdall-blind branch, git warns us about deleting them and tells us to use the -D flag instead.

Since we really want to delete this branch we will go ahead and do so.

BASH

git branch -D heimdall-blind

OUTPUT

Deleted branch heimdall-blind (was 59b9bab).

Finally, we can also delete the heimdall-aware branch on GitLab. Click on “Code -> Branches”, and to delete the heimdall-aware branch click the trashcan icon to the right of the branch name.

Key Points

• Merge requests suggest changes to repos where you don’t have privileges