branching-and-merging
Mercurial: How to keep some files unchanged after merge?
I need to pull changes from one branch to another, but keep some files unchanged. For example: > hg up -C production[详细]
2023-04-11 09:47 分类:问答How do you manage your release branch in SVN?
We use Subversion for our source control system and we do our mainline work in trunk.When we released our software we created a branch.When we need to upgrade our release I will merge revision from th[详细]
2023-04-11 07:12 分类:问答Looking for a TFS branching scheme that supports an integrated testing branch
We are considering moving from SVN to TFS, so I am trying to find a proper workflow to follow in TFS to accommodate our needs. There are a lot of branching scheme discussions out there, but most that[详细]
2023-04-10 23:10 分类:问答Git Rebase or SVN Reintegrate for Feature Branches?
We are currently using S开发者_如何学运维VN, but considering moving to Git to support our new workflow, which relies heavily on rebase.[详细]
2023-04-09 08:57 分类:问答tfs 2010 best practice
we have a very tricky situation which am sure can be avoided if dealt with properly. There were 5 different branches of a specific application in our TFS 2010. All the branches were merged into 1 bra[详细]
2023-04-08 19:58 分类:问答Eclipse SVN : how to use Compare With ... branch? [closed]
Closed. This question is seeking recommendations for books, tools, software libraries, and more. It does not meet Stack Overflow guidelines. It is not currently accepting answers.[详细]
2023-04-08 16:48 分类:问答How to forbid a user to merge revision from other users
We have a subversion开发者_如何学运维 repository trunk q&a branch release branch When Q&A are testing our web site we work on the Q&A branch, commit / update to resolve some bugs.[详细]
2023-04-04 01:37 分类:问答TFS -- Sustainability of Cascading Branches
Branching guidance usually describes an immortal \"Main\" branch, with features branched from Main, and merged back to Main, and Releases branched from Main, with further branches of a Release as nece[详细]
2023-04-01 17:29 分类:问答branching in distributed environments
I\'m interested in hearing how \"branching\" is used in a distributed SC environment. We just started using mercurial for a team environment, and I\'m hoping to learn from others expe开发者_高级运维ri[详细]
2023-04-01 13:59 分类:问答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 分类:问答