'Git Rebase for feature X on feature Z after merge on staging

How to Rebase right for the following problem, is rebase the right Solution? We use rebase for default branching strategies and the only merge happens in MR normaly.

 A--B--C (staging)
        \
         D--E--F (x-feature)
                \
                 G--H--I (y-feature)

I've a staging branch, where I've created a x-feature branch and then I've created my MR for this branch but I need the implemented features and so I've created an other y-feature from my x-feature branch.

And When I am right, when the MR is merged it should look like the following and my y-feature Hangs around, because the MR-Branch gets deleted after MR.

 A--B--C--D--E--F (staging)
          
               \
                G--H--I (y-feature)

How do I get my y-feature reattached to my staging branch, without data loss?

git rebase

Sources

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

Source: Stack Overflow

Solution	Source

'Git Rebase for feature X on feature Z after merge on staging

Sources

Related Questions