'Rebase or merge a branch onto another feature branch merged in master

I have a feature branching scenario that I'm working on, and I'm a little unsure which way to go as the "best solution."

a -- b -- c                               <-- Master
           \
            d  -- e  -- f                 <-- Branch 1 (in review)
             \            
              d -- e -- f -- g -- h       <-- Branch 2

I started working on Branch 1, finished the full implementation, and opened the pull request. However, I needed to create Branch 2 to start the second part of the feature implementation.

a -- b -- c               x               <-- Master
           \             /
            d  -- e  -- f                 <-- Branch 1 (Merged in Master)
             \            
              d -- e -- f -- g -- h       <-- Branch 2

With that, Branch 1 was merged by CI into the Master branch. The problem is that Branch 2 loads all the changes from Branch 1 and I don't know which way to merge the Master changes into my Branch 2.

Interactive Rebase or Merge?

Sources

This article follows the attribution requirements of Stack Overflow and is licensed under CC BY-SA 3.0.

Source: Stack Overflow

Solution	Source

'Rebase or merge a branch onto another feature branch merged in master

Sources

Related Questions