We have a trunk in TFS that everyone works off until we have a need to branch. Our last project was a large feature that required a branch. Now that the development has been completed and the changes have been merged back into the trunk. What should happen to the development branch? Should I delete it? Mark it as read-only somehow? Wha...
Hi I have two data tables say: Table 1: name age ---- --- Bob 40 Table 2: auto kids ---- ---- 3 3 I want to merge the two tables to get something like name age auto kids --- --- --- ---- Bob 40 3 3 Is this possible? I tried merge but it does not seem to be working, thanks. ...
I use Tortoise to interact with CVS for source control. When merging it shows you a diff of the files calling the one on your HD "Yours" and the one in the repository "Mine". Or maybe I have that backwards. As you can see that nomenclature confuses me. Then I also have to try to remember which to merge into. Is there a setting to change...
Example: 2 of our top 3 users are working in almost equivalent projects (I don't know them in depth, maybe I'm wrong): Marc Gravell's Protobuf-Net Jon Skeet's DotNet-Protobuf Jokes about Jon Skeet apart, and dreaming with an prideless ideal world (sorry guys, I am not accusing you of being arrogant, is a fact that every programmer mus...
Using Suversion and WinDiff its no problem to branch / merge class-projects and web-projects. The only kind of project I can never merge are winform projects. The InitializeComponent method is always scrambled after only little changes. Is there any good way to enable diff / merge for .Designer - files? EDIT: I used a 3 way diff lik...
Is there any way to specify to git to automatically resolve the conflicts for a pack of files by taking the remote version for each of them? For instance, to take the remote version of each files in a certain directory? ...
I'm currently working in a branch I created using the Team-->Branch. How do I use Team-->Merge to merge my changes to the branch back to head? ...
Hello. I am working with another colleague in C# in VS2005 in a not very complex project. However, we have no version control system, we send each other our last version and copy the changes into our own files. We now have to merge both files (most of the project is a single form file) into a last version of the project. Any suggestion...
When Mercurial is running under cygwin, it's a bit tricky to figure out how to spawn WinMerge to resolve merge conflicts. How can I do this? ...
I have a medical database that keeps different types of data on patients: examinations, lab results, x-rays... each type of record exists in a separate table. I need to present this data on one table to show the patient's history with a particular clinic. My question: what is the best way to do it? Should I do a SELECT from each table w...
At some point in our past branches of development in git were merged. However, the wrong merge decision was made and therefore some code didn't make it into master branch that we expected would be there. (There were multiple merges of different branches before a final merge to a master branch. So the branching and merging history was...
I have a branch that should be available to other contributors and that should constantly stay up to date with the master. Unfortunately, every time I do 'git rebase' and then try to push, it results in 'non-fast forward' message and abortion of pushing. The only way to push here is to use --force. Does that mean I should use 'git merge...
I would like to use the p4merge tool from Xcode in an SVN setup. Asking for trouble? ...
My development group follows the unstable trunk, stable branches pattern in Subversion. Every month, a stable release branch is created from the trunk. Occasionally, changes need to be merged from these release branches into subsequent release branches and eventually, to the trunk. The problem is that, over the past few months, the merg...
Subversion, Git, Mercurial and others support three-way merges (combining mine, theirs, and the "base" revision) and support graphical tools to resolve conflicts. What tool do you use? Windows, OSX, Linux, free or commercial, you name it. Here's a few that I've used or heard of, just to get the conversation started: kdiff3, DiffMerge,...
I've been fighting the git/git-svn learning curve and last night, as part of that learning curve, I did something very, very bad. I've since gotten it corrected, but I'm hoping to understand the error my ways. I have an svn repository from which I've cloned the trunk and branches (tags I ignored since we don't work on those). Using git...
I am fairly used to using svn for branching and merging, normally this works fine. However one component was worked on in two branches and basically took the component in different directions, so automatic merge won't work and using beyond compare shows the files as mostly different. I have tried to stitch together some of the files, bu...
I have two IEnumerable's. One gets filled with the fallback ellements. This one will always contain the most elements. The other one will get filled depending on some parameters and will possibly contain less elements. If an element doesn't exist in the second one, I need to fill it with the equivalent one of the first one. This code do...
We manage our web development using SVN. On one project, we deployed the site by Exporting the project and FTPing it to the client sever. This client is hands on and has made changes to the code on the FTP. We're hired to add more functionality to the site now. How can I take the work that's been done on the FTP and merge it into my ...
Similiar to: http://stackoverflow.com/questions/170309/three-way-merge http://stackoverflow.com/questions/460198/best-free-3-way-merge-tool-for-windows I am running 2 websites. One is running .net 3.5, the other is not. On the site that is running 3.5 I also have the older version. Right now, I am going through the 3.5 and the 2.0 lo...