Explore Courses Blog Tutorials Interview Questions
0 votes
in DevOps and Agile by (19.7k points)

I created a repo and Github and pushed my files to it. Then had a colleague create a branch and make changes. I want to merge the branch to master.

What steps do I take?

1 Answer

0 votes
by (62.9k points)

Follow the below-stated set of commands in order to merge the feature branch with the master, I am assuming that you are in a branch called featureBranch and you want to merge the changes of the featureBranch with the master,

First checkout to master branch(being present in the changes receiving branch)

git checkout master

Now pull the latest changes in master,

git pull origin master

Merge with the featureBranch

git merge testBranch

Push the changes to the master

git push origin master

That's it, you are done. I hope it helps you!

Welcome to Intellipaat Community. Get your technical queries answered by top developers!

29.3k questions

30.6k answers


104k users

Browse Categories