feature-branch
How to manage this merge in Hg?
I took a clone of an开发者_运维问答 Hg repos a while ago, and have been making significant local commits (major version change).[详细]
2023-04-04 09:17 分类:问答Bug fixes in a feature branch
We\'re using a A successful Git branching model by Vincent Driessenfor our branching model. All\'s fine but I haven\'t really se开发者_StackOverflow社区en a particular issue brought up.[详细]
2023-03-31 20:42 分类:问答Rebasing remote branches in Git
I am using an intermediate Git repository to mirror a remote SVN repository, from which people can clone and work on. The intermediate repository has it\'s master branch rebased nightly from the upstr[详细]
2023-03-09 13:59 分类:问答How do I delete all Git branches which have been merged?
How do I delete branches which have already been merged? Can I delete 开发者_JS百科them all at once, instead of deleting each branch one-by-one?NOTE: You can add other branches to exclude like master[详细]
2023-03-08 03:36 分类:问答Feature branching and loss of code metadata
We use feature branching extensively as a strategy for development. In short and somewhat simplistic terms, what that allows us to do is to keep a stable trunk at all times while developers implementi[详细]
2023-03-04 06:41 分类:问答How can I do git merges in such a way that they are easy to roll back?
There is lots of talk about how it\'s not easy to \"undo\" a merge in git. Short version: if you undo a merge commit, it also tells git to never merge those changes back in in the future.[详细]
2023-02-05 08:55 分类:问答Is using “feature branches” compatible with refactoring?
“feature branches”is when each feature is developed in its own branch and only merged into the main line when it has been tested and is ready to ship. This allows the product owner to choose the fea[详细]
2023-01-22 15:20 分类:问答Merging feature branches to release branch instead of trunk
I have a question about two source control scenarios, both with feature branches and release branches:[详细]
2022-12-21 22:12 分类:问答Subversion feature branch requires changes from another feature branch
I have two feature branches: featureA and featureB. FeatureA is complete, but not merged into trunk because it\'s untested and we\'re not ready to test it yet.[详细]
2022-12-07 23:58 分类:问答