Workflow description for git usage for in-house development -
The company I work for wants to release monthly, and I have to explain them to switch I am trying. I believe that there is an integration branch for proper leakage (i.e. monthly) and it has branches for integration branches for new development and changes. The environment is filled with mutual dependence and sometimes due to delays in the facilities required by other features in another environment, one facility has to be postponed in a different month. Projects will usually have activity on 2-3 integration branches in parallel and activity is limited to a group of people who are very close in touch. (Which means I suspect that as long as we are on the last integration branch, you can use rebacing, which is less than half for less than half of people)
Quantity, so I need some direct guidelines for how to do this, logical interpretation of both the branch / merge structure and practical guit order are for doing this. Does anyone know of such details that are properly fit for such workflow?
Text after "div class =" itemprop = "text">
A logical explanation of branch / merge structure
Structure Basically what you said is: an integration branch, and branches of facilities.
In this kind of workflow, this is the key to understanding, as you did, that all the development will not bring it into the next release. But with a DVCS, it is also important to understand that any branch can be published and cloned.
P> Whenever a developer has to merge his work on any integration branch (he is pulled from the "central" repository), I would recommend:
# Switch back to the previous release tag (from where feature branches were made for the next release) $ git checkout previous release tags # create your own private $ git Checkout-b myIntegrationbranch # Merge or Cher Ry-picking What we really want to put in the next $ $ git merge ... Our facility branch # rebase that real integration branch Re-integration Branch integration Branch at the top of $ Git < / Code>
The previous rebase will have to re-write the history of your local consolidation, but in a branch you will not be published (so that no harm is done). Once all of your new features are working, you can merge back
that of the Private Branch related integration branch of the current head
"Private branch - merge or cherry picking - Rebecca - Local resolution - Reconciliation "is an essential workflow because many teams have to merge their work into a common branch. Before merging into a common branch, want to publish them in a private branch, otherwise it may break every team which is represented by the head of the normal branch.
Other details in the questions:
Comments
Post a Comment