In this tutorial, we are going to learn about how to merge a branch into the master in Git.
Consider we have a two branches
master in our git repository and we need to merge the
dev branch into a
- On the
git merge mastercommand to check any merge conflicts with a
git merge master
- Now, change your current branch to master by running the following command.
git checkout master
- At final, run the
git merge devcommand to merge a
devbranch into a master.
git merge dev
Note: In your case, the
devbranch should be some other.