The SVN repository that I am working with has a rather large number of branches. I am only interested in working with three of them and maybe another new SVN branch that will be created in the future. What I have figured out so far is that the command git svn clone URL -T trunk -b branches -t tags will clone all SVN branches and subseq...
I'd like to push and pull all the branches by default, including the newly created ones. Is there a setting that I can define for it? Otherwise, when I add a new branch, locally and I want to pull it from the server, what is the simplest way to do it? I created a new branch with the same name and tried to pull but it doesn't work. Ask...
Preface I realise there are already a lot of questions about merging SVN branches on SO. I have read many of them, but still haven't really found the information I'm looking for, so please read this question in it's entirety before proposing to close it as a duplicate I need to merge one SVN branch into another. I'm pretty comfortabl...
Background I'm working with just one branch - master. 3---------2--------- | 6-------5---------4---------1---------- I made commits 1-3, then realised I wanted to work from commit 1 for the next section of work. I checked out commit 1, then made commits 4-6. Ooops. Commit 3 contains some important ...
Using subversion v1.6.6 and TortoiseSVN v1.6.6.. After having created a branch and meticuously adding detailed comments whenever doing a commit on the branch, I can't seem to find those comments after I have merged the branch back onto the trunk. Note : We're employing a feature branching strategy where all development is done in new b...
I am trying out GIT, and using the GIT GUI (from msysgit) with it. I am trying to make a new branch, but somehow it keeps taking over the master branch. The master branch still appears, but not as the actual master. As a result, I also can't merge my new branch into the master, but it requests me to do the opposite (master into new bran...
Hello All, Stupid question and treat me as completely a newbie to version control. I'm new to Git (I've used subversion before, but just the basics) I understand the basics of Git and its branching commands, I have an imaginary situation that need your advice. Suppose my software currently is at v1.2, stable and released. My Softw...
I have a svn repository. I have now created a branch for this repository to do some major dev work. Now some of the features that I can created in my project can be committed directly to the main repository instead of the branch. Is there a way to do commit those changes without having me to switch the branch again? Update: I am using ...
I'll be honest, SVN branches scare me. The last project that I worked on which used them extensively, I seemed to spend half my time testing my branch worked, doing a dummy merge into trunk, doing a real merge - only to find someone else had just committed while I was doing this and I had to update and start over. On that particular pro...
I would like one branch that I have been working on to override the current trunk on my fossil repository, and I wonder is there an option for this? Currently when I merge the leaf of a branch into the current trunk I get Merge conflict markers in the file. There are a lot of files and I know the changes from my branch are correct. Is...
Is it possible to change the tag on a branch to make it replace the trunk without merging? Update: I solved it, I also see now that it doesnt matter trunk is nothing more than a name, you can close it and use another. ...
I created a bugfix branch to fix a bug on a project that I had forked on Github. I gave a pull request to the developer to incorporate my fix, but the developer decided to implement a different fix for the problem. At this point, I want to delete the bugfix branch both locally and on my project fork on Github. Successfully Deleted Local...
i have a branch in TFS from my main team project. The changes that have been done on the branch, I want those files to be updated in my main Team project. How do i do that? ...
Long story short*, I did some things with my git repository that I don't know how to do, and ended up detaching my head, that is, when I commit master isn't up to date. How can I fix this? Do I have to merge? (If so, what are the exact commands I want to run?) When I run git branch, it tells me I'm currently on no branch $ git branch...
Hey all, I'm running SourceSafe and I have two branches of my code. I'm currently using the manual approach of running a report to show differences and then manually merging each file one by one. However I'm trying to find a streamlined way to do this on the project level. It's ok if the process shows me each file one at a time, I'm jus...
I'm about to branch a project that uses EF. I know that there will be a modicum of changes in the trunk, as well as many changes in the branch. I will need to merge in changes from the trunk into the branch from time to time. I'm not concerned about the straight up C# code that usese EF objects (Linq to Entities) I'm concerned about t...
Simply put I have the following branch setup: MAIN |--- DEV |--- PROD Most developments are done in the DEV branch. When the code is ready to test, everything is merged to the MAIN branch and published to our test environment. When tests are completed, a merge to PROD is done and everything is published to the production server....
Hi, I have project with many branches. I would like to work on these simultaneously without switching back and forth with git checkout. Is there any way I can do that besides copying whole repository somewhere else? Thanks. ...
I have created a branch called "feature3" from my trunk. I make zero modifications to files on the "feature3" branch. There are also no modifications to files on trunk. Using TortoiseCVS (TortoiseSVN 1.6.6, Build 17493 - 32 Bit) against a SVN (version 1.6.3 (r38063)) repo, I initiate a "Merge" with the "Reintegrate a branch" option se...