Merging a PR
In this lesson we will see what happens when we merge a pull request.
Now that we finished all the changes we wanted to make and the PR is validated, we should probably let others in our team review the changes so that knowledge is spread. We’ll skip that part because I assume you know how to review code, but also because we’ll explore that in more detail later when we discuss GitChat principles. So, we’ll skip code review and proceed with the merge of the pull request to the master
branch.
Merging the PR to the master
branch#
Please open the pull request screen in GitHub (unless you already have it in front of you) and click Merge pull request, followed by the Confirm merge button.
You already know what happens when we push or merge code into the master
branch, so we’ll just relax for a moment or two while we watch the activity of the newly initiated build.
Please press ctrl+c to stop watching the progress when all the steps of the new build are reported as Succeeded
.
Confirming the newly deployed release#
The only thing left is to confirm that the new release was indeed deployed correctly to the staging environment. First, we’ll list the applications managed by Jenkins X.
The output is as follows.
Next, we’ll send a request to the application in the staging environment to confirm that the output is indeed correct.
⚠️ Make sure to replace
[...]
with the address from theURL
column from the previous output before executing the commands that follow.
The output should be the hello, PR!
message.
Even though we merged the pull request to the master
branch, we did not yet see all the phases. We still have some cleaning to do.
Checkout and pull the latest code#
Before we move on, we’ll checkout
the master
branch and pull
the latest version of the code.
In the next lesson, we will look into the garbage collection in Jenkins X.