Merge

Merge the approved PR into the main branch and delete the branch.

Merging an approved PR

When a pull request has been reviewed and approved, its changes can be merged into the main branch. After merging, the feature branch can be deleted if it is no longer needed, keeping the repository clean. This operation can involve both the local branch and the remote branch.

git switch main
git merge feature/cart
git branch -d feature/cart

Branch cleanup after merging

After a feature branch has been successfully merged, you can delete its local copy with git branch -d. To delete the remote branch, use git push origin --delete. Before deleting a branch, make sure you are on the correct branch and that the merge is complete.

git branch -d feature/cart
git push origin --delete feature/cart

Exercise Clean up branches after a PR

Assume that the feature/checkout branch has been approved. First switch to main and merge the feature branch. Then delete the local branch and finally remove the remote branch. Write the four commands in the correct order.

Show example solution

git switch main
git merge feature/checkout
git branch -d feature/checkout
git push origin --delete feature/checkout

Test yourself

Which command transfers an approved feature branch into the main branch?
- git tag feature/cart
- git merge feature/cart
- git restore feature/cart
- git fetch feature/cart
Show answer

git merge feature/cart — While on the main branch, git merge combines the changes from the approved feature branch.

Delete the remote feature branch

git push origin ____ feature/checkout

Show answer

git push origin --delete feature/checkout

Merging and cleanup

git switch main

Switches to the main branch
git merge

Merges branch changes
git branch -d

Deletes the local branch
--delete

Deletes the remote branch

Next lesson: Branch management

We Are Enhancing Your Experience

Cookie Preferences

Strictly Necessary Cookies

Analytical Cookies