0

I want to merge a feature branch into a newly created feature branch.

My new branch was created off of the master branch and now I want to merge the changes from another feature branch into that new feature branch like this:

git merge feature/my-new-feature

However this did not work and I cannot find an answer that works. How can I do this?

Miger
  • 1,175
  • 1
  • 12
  • 33

1 Answers1

1

You were actually pretty close.

As described in this issue here.

First, position yourself on the branch where you want to merge : in your case "feature/my-new-feature".

Just run a :

git checkout feature/my-new-feature

Then you will want to do the actual merge telling git which branch contains the changes you want to merge into the current branch, in your case the "feature/my_first_feature". This is done with a :

git merge feature/my_first_feature
Léon Rohrbacher
  • 26
  • 3