Articles → AZURE DEVOPS → Merge The Changes From One Branch To Another In A Repository

Merge The Changes From One Branch To Another In A Repository

In this article, we will merge the changes from one branch to another in a repository.

Branch Creation

For this example, we have created 2 branches i.e. "master" and "dev".

Picture showing the 2 branches created in a repository

Click to Enlarge

Our requirement is to merge changes from the "master" to the "dev" branch.

Perform Changes In The Master Branch

Here, we will perform the following actions

Add a new file "2.txt"
Commit the changes and push it on the remote server using the following commands.

Picture showing pushing the file in the repository using git bash

Click to Enlarge

Create A Pull Request

Once the changes of the "master" branch is pushed on the remote repository, you need to create a new pull request. For that, click on the "Pull requests" on the left-hand side menu.

Picture showing the Pull requests menu in side the repository of the Azure DevOps portal

Click to Enlarge

A screen appears as shown in the figure below. Click on the "New pull request" button.

Picture showing the New Pull Request button for creating the new pull requests

Click to Enlarge

A new pull request screen will appear as shown in the figure below. Select the source and destination branch.

There is a section that specifies the commits performed on the "master" branch. You can click on the "Create" button to start the merging.

Picture showing the New Pull Request form

Click to Enlarge

Approve And Complete The Request

Once the request is created, you have to approve the request and then complete the merging. You can use the "Approve" and "Complete" button as shown in the figure below.

Picture showing the Approve and Complete button for approving and completing the merging

Click to Enlarge

To approve, click on the "Approve" → "Approve".

Picture showing the Approve menu for approving the request

Click to Enlarge

Once the request is approved, click on the "Complete" → "Complete"

Picture showing the Complete menu for completing the merge request once the request is approved

Click to Enlarge

A window appears on the right-hand side.

Picture showing the screen to complete the pull request

Click to Enlarge

Click on the "Complete merge" button to complete the request.

Picture showing the completed status of merge

Click to Enlarge

Changes In The Dev Branch

Once the process is completed, you can see the changes in the "dev" branch as well.

Picture showing the list of changes done on the dev branch

Click to Enlarge

Posted By -	Karan Gupta

Posted On -	Friday, June 4, 2021

Query/Feedback

Your Email Id

Subject

Query/Feedback	Characters remaining 250