branching-and-merging

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

SVN: Merging two branches together

We have multiple developers working on a project. We\'re employing a feature-branch method of branching in which we do the following:[详细]

2023-01-27 21:17 分类：问答
Does perforce track deltas unique to a changeset or does it just store the whole file?

I tried to merge some work that a developer did in a working branch to a s开发者_运维知识库table branch.The files a, b, and c had been changed by at least a dozen changesets since the common ancestor[详细]

2023-01-27 00:48 分类：问答
Can I commit changes to multiple mercurial subrepos to a new named branch?

I have a mercurial repository with multiple sub repositories inside it. The repository has a visual studio solution containing projects in the repository and the subrepository.[详细]

2023-01-25 18:51 分类：问答
What makes Git better than Subversion for merging? [duplicate]

This question already has answers here: Closed 12 years ago. Possible Duplicate: Merging: hg/git vs. svn[详细]

2023-01-25 13:25 分类：问答
TFS 2010 Hotfix Branch/Merge Strategy without baseless merge?

I 开发者_开发技巧am trying to understand how to work with branching and merging in Team Foundation Server 2010. The strategy below is for a web development team.[详细]

2023-01-24 22:33 分类：问答
Trying to figure out the right approach to using submodules in git

I\'m trying to get a submodule setup properly in git and I want to make sure I use it right. I have main repository called MyProject. I have a secondary repository that contains all of our code gener[详细]

2023-01-24 13:13 分类：问答
svn import mess, nothing on trunk

I looked at how to create trunk directory in existing svn repo without a trunk and move all, and it might be applicable, however, I have a \"trunk\" but the manner in which the developer, a senior one[详细]

2023-01-24 05:00 分类：问答
How to get developers to remember to merge their bug fixes everywhere?

We use the branch-per-release model of development with Subversion. We tend to have 2 or 3 active branches at a time - trunk (development), and two release (maintenance) branches (i.e. 5.0 and 6.0).[详细]

2023-01-23 08:09 分类：问答
Migrating a branching strategy from ClearCase to TFS 2010

I am in an \"internal\" IT shop and we currently use ClearCase for version management.Our branching strategy is common for this with the main branch being reserved for live code and branching off main[详细]

2023-01-22 23:31 分类：问答
subversion merge trunk -> branch: trunk changes not recognized

I\'m in a pickle.I\'m using SVN 1.5 at Beanstalk and Tortoise SVN client 1.6.11 x64 on Windows 7. I\'m developing on a branch and have been merging changes from the Trunk into my branch at least once[详细]

2023-01-21 09:20 分类：问答