Let's talk about how to set up a protected branch and submit a PR in Gitlab

This article is about learning Gitlab, talking about how to set up a protected branch and submit a PR to your Leader. I hope it will be helpful to everyone!

How to set up a protected branch

What is a protected branch?

We introduced it in the git flow workflow earlier. master｜main (main branch) branch is the online branch. If every developer can push code in the main branch at will, If when going online, a developer accidentally pushes code that he does not need to go online (which may have many bugs) to the main branch and brings it with him when going online, the damage caused may be irreparable. So we need to set the main branch to not allow push, and we can only merge our code into the main branch through PR.

Let’s do it next. Find settings->Repository->Protected branches in the project, select the protected branch, here our main branch is main, and then select merge The permission is Maintainers, which does not allow anyone to push code to the main branch. Finally, click profect

Let’s try to push the code

It can be clearly seen that no one is allowed to push the code. To push code, you can only create a new branch to push to the remote, and then merge the code into the main branch.

How to submit a Merge request

Why is there a Merge reqeust?

As mentioned earlier, the main branch is our protected branch and there is no need for local push code. So how do we merge our code into the main branch? At this time, the developer needs to initiate a Merge reqeust to merge our code into the main branch. Merge request has another very important purpose, which is code review.

What is code review?

code reviewThe translation is code review. A company, a team, has standards for code, requirements for code, and requirements for quality. The code you write must be reviewed by your leader before it can be merged into the main branch, so this step is done Before your supervisor merges, the code you wrote will be reviewed with the naked eye to ensure that there will be no major online problems before it will be merged for you. If there are problems, you will be asked to change the code and resubmit Merge requst , until the online requirements are met. The purpose of this is to ensure that there are no problems online. After all, if a major online bug occurs, your leader will have to bear the responsibility and risk, and department leaders with serious problems will also be in trouble. Therefore, we must be very rigorous when writing code.

Having said so much, let’s do it in practice.

Create a new dev branch locally, and then modify some things push to the remote. For the first push, you need to use git push -u origin dev, Because the remote does not have this branch.

Refresh the page and you will see that we are now in the main branch, with a Create merge request button displayed on it. This is where we initiate the merge request. Click on it

Enter the merge page. Here we can see that we now want to merge the dev branch to the main branch. If we want to merge other branches, click change branches can be modified. title and description can fill in the function description related to the merge you submitted.

Assignee and Reviewer are the assignee and reviewer. To put it bluntly, who will review the code for you? You choose who you want.

Here you can see the commit information and modifications submitted by you for this merge

Finally, click Create merge request to initiate a merge request. The rest is for your leader to review the code.

The merge information your leader sees is like this. Here he can see your commits and changes, and thus the modifications to your code. No problem, click the Merge button to merge.

The above is a process of completing Merge reqeust and its importance.

The merge process can also involve some CI/CD work, such as lint verification of code specifications, code unit testing, etc., which will be discussed one by one later.

(Learning video sharing: Basic Programming Video)

The above is the detailed content of Let's talk about how to set up a protected branch and submit a PR in Gitlab. For more information, please follow other related articles on the PHP Chinese website!