branching-and-merging

相关标签：javascript jquery android 多少钱 iPhone

TFS project working simultaneously on two branches

we have a .net framework 1.1 project deploy on production server. we want to migrate it to .net framew开发者_如何转开发ork 4.[详细]

2023-02-22 10:38 分类：问答
How can I use git for projects templates?

I have some template/starting point code that I reuse across projects. While workin开发者_如何学Pythong on the new project, I always want to add and change things in the template.[详细]

2023-02-22 08:36 分类：问答
Mercurial: repository layout for multi-customer project

We have this webapp product being deployed for multiple customers and think about switching from svn to mercurial. In svn, we see the trunk as our projects \'core\', while branches are setup for each[详细]

2023-02-22 00:32 分类：问答
Mercurial - Merge two branches into a 3rd new branch

Is it possible to, instead of merging one branch into another existing branch,开发者_Go百科 merge 2 branches into a 3rd new branch?Just merge your 2 existing branches and consider the merge as the tip[详细]

2023-02-18 02:38 分类：问答
Merge/rebase a 'disconnected' branch in Git

Suppose we have the fol开发者_高级运维lowing situation in Git: X---Y feature / A---B---C---D edge[详细]

2023-02-17 19:55 分类：问答
VisualSVN VS2010 merge failing

Our company is migrating from VSS to SVN as part of an upgrade from VS2005 to VS2010. I am evaluating the VisualSVN implementation – VisualSVN Server looking after the repository, and using VisualSVN[详细]

2023-02-17 11:56 分类：问答
Merging Mercurial branches from separate repositories

I\'m trying to figure out how to merge branches from a separate repo into the current. I have the following:[详细]

2023-02-14 12:52 分类：问答
Git: apply topic branch using rebase (without merge)

There is a small topic branch (on a contributor\'s remote repo) that I\'d like to apply on top of my master.I think the canonical way to do this is:[详细]

2023-02-14 00:40 分类：问答
TFS2010 - Exclude specific files from merge

I have a simple branch plan with a main and a development branch. In the development branch I have beside the source code some documents related to the development process which should not be merged t[详细]

2023-02-12 03:52 分类：问答
Mercurial: Any ideas on how to skip some changesets when merging between branches?

Here our situation: We have two branches in our Mercurial repository lets call them Branch A and Branch B.[详细]

2023-02-11 01:38 分类：问答