branching-and-merging

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

How to move some last Git commits currently on a branch, onto another branch?

I have a repository where I had been working on master branch having last added some 10 or so commits which I now wish were on another branch, as they describe work that I now consider experimental (I[详细]

2023-02-01 14:54 分类：问答
Questions about task driven branching

I\'m considering switching from HG to Plastic SCM (http://www.plasticscm.com, mainly because it seems to offer much nicer VS integration), and they promote \"task driven branching\", that is, branchin[详细]

2023-02-01 09:00 分类：问答
How do I prevent a branch from being pushed to another branch in BZR?

We use a dev-test-prod branching scheme with bzr 2. I\'d like to setup a bzr hook on the prod branch that will reject a push from the test branch. Looking at the bzr docs, this looks doable, but I\'m[详细]

2023-02-01 07:16 分类：问答
creating a subversion branch after creating project at repository root

Pls. see Creating a Subversion branch. I created a repository with a URL http://reposerver/svn/repository/ and checked out a working copy and started adding files to the root instead of doing it into[详细]

2023-02-01 05:18 分类：问答
merging changes in tfs

We have a main development branch, which was branched for a release 1.0.We also have branched the main development branch to do some parallel development.A hot fix was done in the release 1.0 branch a[详细]

2023-01-31 16:17 分类：问答
TFS 2008 Branching always adds root folder

I\'m trying to create a branch for QA using TFS 2008 I have my main code in the trun开发者_运维问答k folder.[详细]

2023-01-31 05:53 分类：问答
git -- locking master branch for some users?

I would like to force other team-members to not work on the master-branch but on a development branch. we have a central git-repository where we push our work into. i would like to know if it\'s possi[详细]

2023-01-30 13:56 分类：问答
svn -- Time since last merge

I am in need of a \"time since last merge\" report. We have a single branch where changes from other branches are integrated. To keep everyone in sync, we encourage branch masters to perform a merge f[详细]

2023-01-29 12:30 分类：问答
Git - don't merge deletes

I\'ve a branch develop with files: index.php test.php I\'m creating branch release from it, where I set versions, make small bugfixes, etc, and delete test.php which doesn\'t go into production re[详细]

2023-01-29 09:22 分类：问答
Using Subversion and TortoiseSVN, how do you clear your local action history?

I merge changes of a file from a branch into the trunk-branch. I wrongly resolved a conflict, and want to start from scratch, so I revert the trunk-file to it\'s original state.[详细]

2023-01-27 23:33 分类：问答