Geek Answers Handbook

Github only deploys certain features in the development branch

So, I will figure out the simplest branching / deployment strategy from Github, which at least has a dev and release (master) branch. After seing this answer, I think it is really close to what we need. In addition to one big problem with the ability to deploy only certain features. Not all.

The 2 options presented here are not good enough. This is a common scenario, and returning every time is simply disgusting. In addition, I read that cherry picking has other problems, and also especially because cherry picks are copies (is this true?)

Now, I mean that if for the new functions that we are starting to work on, we create a branch and we merge them in our selected Dev industry, we can merge these branches to the release branch ( instead of merging with dev to the release branch, we merging with the function branch in both dev and release so that we can choose what to release ), so we would only have the desired changes, ready for release. I can think of at least two possible problems with this:

  • The feature branch has been combined with both the developer and the release, will this help me later?
  • Will this work? since my art branches can be based on changes made in other art branches (they will be based on Dev), when I combine the Dev function I would pull it out first, thus adding other functions to.

So, in short, how can I save the dev branch, make some changes there, and then move some things to another branch ?.

Many thanks.

+4
source share
1 answer

Can you do this. Here is what I would recommend:

  • Set aside all branches with master. This does two things:
    • Your branch is based on production, so it’s ready to go
    • You do not have things in your branch from devthat are not yet ready for release
  • If you want to free the branch:
    • Combine branchinmaster
    • Deploy
    • Combine masterin devto update it. Otherwise, people devwill get farther and farther from production.
  • When your branch is finished, but you do not want to release it, merge it into dev
  • dev
    • dev master
    • Deploy

-, , - , cool_feature, fix_terrible_bug, cool_feature. fix_terrible_bug cool_feature . fix_terrible_bug , master dev, cool_feature, cool_feature , fix_terrible_bug. , Git (, , , ).

, , "" . Git , , , .. cherry-pick, commit, - commit , . - Git . , , "" , -op .

+4

More articles:


All Articles