我分支了错误的分支，如何将更改移动到正确的分支？

Question

We have a develop branch and a release branch.

I was asked to make a change, but was later told that the change had to be a hotfix and so I should have branched off the release branch.

The current situation is this (I drew the diagram myself):

I really don't want to loose all my work that is currently sitting on my feature-branch . How do I move all my changes in feature-branch so that they sit in a new branch but one that is branched off release branch?

What have I tried?

I tried using rebase --onto but I got the following error:

$ git rebase --onto release-branch feature/1 feature/1a

fatal: fatal: no such branch/commit 'feature/1a'

Answer 1

To duplicate the commits from feature , and only them (no commit from develop before or after feature forked from it), you can use the following commands:

git checkout -B feature release      # Checkout `release` and bring `feature` along
git cherry-pick develop..feature@{1} # Retrieve commits from `feature` which are not on `develop`

Answer 2

Try this commands (pseudo-code: apply your naming correctly)

git checkout release
git rebase feature

After these commands, you will have work from feature branch in release branch.

However if develop has accepted commits after feature branch was checked out, those commits will not be present nor in feature nor in release .

You will need to rebase your release branch agains master in order to have them in release branch. By running:

git checkout release
git rebase develop

PS Here is the link that describes the rebase command https://git-scm.com/docs/git-rebase

Answer 3

I think the best way to do this is to rebase your Feature branch onto Release. The git rebase command is quite flexible. You can tell it where to move your branch, and how much of your branch to move.

This command will move the Feature branch to branch off Release, starting from the commit after the Develop branch:

git rebase --onto Release Develop Feature

or alternatively:

git checkout Feature
git rebase --onto Release Develop

No need to create a new branch or delete your original one.