I am wondering how I should properly get rid of branches that no longer have any purpose. Right now even if i delete them and commit they are still listed as branches in the properties windows for a particular branching root (directory). If I select merge I don't get an option to merge to the deleted branch which obviously is as expected...
I am able to create the same SVN branch twice. I would hope that SVN would not allow me to create same branch again. Please help me to fix this issue. ...
Say I have a git repository and I've been working on master, can I retroactively create a branch. For example: A - B - C - A1 - D - A2 - E I want to make it look like this: A - A1 - A2 \ \ B - C - D - E The specific use case is when I've cherry-picked a bunch of commits into an old version branch and it needs to go ...
If I check out a tagged version of my source code without creating a branch, Git indicates that I'm not associated with any branch at all. It's happy to let me make changes and check them in though. Where do those changes go? If I switch back to 'master' they disappear (overwritten by what was in master) and I can't seem to find them aga...
Hi, I have two branches : X and Y. I want to replace a Y's subdirectory (y1) by its equivalent from X (x1). For the time being, I do the following : copy x1 to Y, remove y1, rename (move) x1 to y1 : a) svn copy https://path/to/branches/X/x1 https://path/to/branches/Y/ b) svn delete https://path/to/branches/Y/y1 c) svn move https://pat...
Tracking a single remote branch as a local branch is straightforward enough. $ git checkout --track -b ${branch_name} origin/${branch_name} Pushing all local branches up to the remote, creating new remote branches as needed is also easy. $ git push --all origin I want to do the reverse. If I have X number of remote branches at a s...
If I make changes in the trunk to 3 different files, say revisions 40, 45, and 47 respectively, where none of those files have changed since revision 15, how can I merge those revisions into the branch (made at revision 30 and unchanged since) so that I get just the changes between rev 15 and rev 40, 45, and 47 for each of the respective...
I have an svn repository where I have trunk and a branch. I intend to merge the trunk into the branch at regular intervals, however, when I do this I see many property status changes, in additional to actual file content changes. On further investigation the property changes are mergeinfo properties. I wouldn't expect this because we ...
I have a set of work items that are completed and I am ready to move their changes to our production branch. Is it possible to find the changesets that are attached to them and selectively merge them with the target branch? ...
A common scenario when using source control is to have a development branch along with versioned release branches. We use CVS, with HEAD as the development branch, and a branch named e.g. release-6-2 for the current release of a product. Development of new features go into the development branch only, but bug fixes sometimes have to be ...
We have a HEAD branch, and a feature branch that was created off the HEAD branch. I develop on the feature branch, and constantly merge changes from HEAD to my branch. When I'm finished with the feature, I try to merge it back to HEAD. This is supposed to be a 0-pain operation, as all conflicts were already resolved on previous merges t...
sometimes, git will spontaneously (during some, but not all, "pull" or "clone" operations) copy all of the remote branches of a repository into my local repository (and even set them all up to track the corresponding remote branches correctly). What causes this? Is there a way I can do this on purpose? ...
We have a VS 2003 solution that consists of several ASP.NET web service project (and, no, we aren't in a position to upgrade to VS 2005/2008). Currently, the local paths for the web service projects all point to WWWRoot. I figured this will be a problem w.r.t. branching and I’m wondering if there’s any way to configure things so that...
Using TortoiseSVN, I need to take changes I've done in a branch and then merge them with Trunk. I am the only developer on this project, so I know trunk hasn't changed. I am learning SVN so that eventually my team can use it. Basically, I want my trunk to look exactly like the branch. In pre-svn world, I would just copy the files i...
Not long ago we were using Microsoft VSS as our version control tool, and used to create branch of our code after the end of every release and deploy that to our clients. Now we have moved to SVN and lately there have been lot of discussion about tags/branches, should we tag/branch our code after development for a particular release? S...
We have a subfolder that is a relative svn external (../project/subfolder). In a fresh trunk checkout it points to (...TRUNK/project/subfolder) and in a fresh branch checkout it points to (...BRANCH/branchName/project/subfolder). But if you do a switch on the project containing the subfolder, the subfolder stays pointing at TRUNK. Alt...
Git has a much-touted(?) octopus-merge capability that can merge many heads into one. But is there something that would do just the opposite, make several simultaneous branches out of one node? Let's assume that I have a bunch of code for a project, and I just started using Git. Some of the features are complete in that project, others...
...so I've gotten used to the simple stuff with Mercurial (add, commit, diff) and found out about the .hgignore file (yay!) and have gotten the hang of creating and switching between branches (branch, update -C). I have two major questions though: If I'm in branch "Branch1" and I want to pull in some but not all of the changes from br...
I'm using git on a new project that has two parallel -- but currently experimental -- development branches: master: import of existing codebase plus a few mods that I'm generally sure of exp1: experimental branch #1 exp2: experimental branch #2 exp1 and exp2 represent two very different architectural approaches. Until I get further...
Branching always seems to be a complicated thing to do. Not technically but yeah there are some real decisions/planning that goes in to come up with an appropriate branching strategy. I know of this TFS Branching Guide Any other resource or guideline which you recommend or use for branching and merge. Sharing your experience in this ...