Merge multiple branches in single branch in git

Question

I have a master branch and multiple test branches. I need to create a local test(some branch)branch and merge all the existing test branches into the newly created local branch and resolve the conflicts.

So far, I have created a local branch after cloning as follows:

• git clone <remote url>
• git branch <some branch>

Now, how do I proceed further? I new to git. Help would be appreciated.

Answer 1

Assuming you want to base your merge-target branch off master, you could try the following:

git checkout master
git checkout -b test-merge    # create the new branch

And then just merge each of the test branches into test-merge:

git merge test1
# resolve conflicts, commit
git merge test2
# resolve again, etc.