I wrote this piece of code to merge two .NET configuration files: Add non existent nodes and override values on existing ones. I avoided to use the much faster reader/writer way because the app I'm using it for is not performance critical. What do you think of this? using System; using System.Xml; namespace devcoach.FrameworkExtension...
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...
I am currently using CVS (not my choice) and have several branches. I'm trying to merge two branches, but a deployment project file has conflicts that I can't resolve without spending a LOT of time. A trivial change to a project file results in drastic changes to that project file - thanks to GUID changes I guess (making a project file...
Using Perl, how can I combine or merge the sample PDF files into a single PDF file? ...
Hi, this may be a naive question, but, as asked in the object, what is the actual way used by versioning softwares to merge a branch back into the main trunk without generating broken code? Here's a quick example: I make a branch out of the main trunk for the program "Hello World Power edition". I add support for Klingon. This is a radi...
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...
Hello, I think i have a rather unique problem to solve. Well, i cant find enough information using Google. So here it goes, I work on a JEE SOA application which stores XML documents as XML using Oracle XML DB. Whenever the XML changes, i increment the version and throw the previous version into a different table. The requiremen...
Suppose I have two branches of a project IMClient-MacOS and IMClient-Windows, and their code only differs by (let's say) one directory main/. All the other directories contain system-independent code and are interchangeable. Some workers work on the Windows version, and some work on the MacOS version. How do they prevent overwriting c...
...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...
Previously I've asked about inserting a column into a dataset. I now have a similar question...namely merging two or more columns into a single column. Lets say I have the following data set: DataSet ds = new DataSet(); ds.Tables.Add(new DataTable()); ds.Tables[0].Columns.Add("id", typeof(int)); ds.Tables[0].Columns.Add("firstname", ty...
I've been using git now for a couple months on a project with one other developer. I have several years of experience with svn, so I guess I bring a lot of baggage to the relationship. I have heard that git is excellent for branching and merging, and so far, I just don't see it. Sure, branching is dead simple, but when I try to merge,...
I've heard that many of the distributed VCSs (git, mercurial, etc) are better at merging than traditional ones like Subversion. What does this mean? What sort of things do they do to make merging better? Could those things be done in a traditional VCS? Bonus question: does SVN 1.5's merge-tracking level the playing field at all? ...
I'm looking for a good free 3-way Merge/Diff tool for Windows. I know of KDiff3. But I was looking for further recommendations. ...
Many editors will notice when a file changes out from under them. Are there any editor that will offer to let you do a three-way merge if you have unsaved edits on the file? The common scenario for this is I forget to save a file before I so an SVN update and when I switch back to my editor realize that I now have the choice of stomping...
Implement an algorithm to merge an arbitrary number of sorted lists into one sorted list. The aim is to create the smallest working programme, in whatever language you like. For example: input: ((1, 4, 7), (2, 5, 8), (3, 6, 9)) output: (1, 2, 3, 4, 5, 6, 7, 8, 9) input: ((1, 10), (), (2, 5, 6, 7)) output: (1, 2, 5, 6, 7, 10) Note:...
I have two XML files. They are similar, but there are two nodes of which either of the file have only one. I want to merge two sets of such documents in one single document where first the node of side A is taken, followed by the nodes of side B. I'm not an experienced user of diff tools and downloaded KDiff3 to start somewhere.. Can an...
Hi peeps, I need to merge a whole bunch of docx files programatically. Imagine they are numbered 1 to 10. I essentially need a final.docx file that contains all 10 documents in it. If I can append the second to the first somehow, then I can repeat it for the third, then fourth, etc. Note that I do NOT need to rebuild a table of content...
Our perforce admin limits "max-row" scans so that my first idea of running the following will not work: All changes including integrates into a branch at particular label time 1 All changes including integrates into a branch at particular earlier label time 2 Subtract time 2 changes from time 1 to get the new changes with comments. I...
I'm merging in a remote branch that may have a lot of conflicts. How can I tell if it will have conflicts or not? I don't see anything like a --dry-run on git-merge. ...