All geek questions in one place

Merging branches into wizards, but limiting your commits

feature-branch----C---D / develop---A---B / master

I have a feature-branch that has been merged with the develop branch. This development branch is a continuous branch that merges into a master weekly. I have completed work on this branch of functions, which is solved after she needs to go directly to the wizard. I do not want commits A and B to evolve to go to wizards. Is there a nice solution that will allow me to get C and D commits into masters without cherry picks?

Thanks,

Braden

+4
source share
1 answer

You must reinstall feature-branch to master, removing its dependencies on the commits A and B. If C and D have real semantic dependencies at the code level on A and B, then of course you are out of luck.

The following sequence of commands will change feature-branch to master instead of develop :

 git checkout feature-branch git rebase --onto master develop
+4
source

Source: https://habr.com/ru/post/1444617/

More articles:


All Articles