Hello, I created a new branch to do some (breaking) work while the other developer kept chugging along working on trunk. Well, now that I got this branch done and ready to merge, I'm having trouble. I am using TortoiseSVN. I did the "merge two separate trees" and what is appears to do is just copy all my changes from the branch into tru...
I'm trying to create a utility method that will accept two arrays as parameters, merge them together, and return the resulting array. Discarding duplicates. Ideally, the parameters would accept any array type, such as int[] or string[]. I'm using C# .NET 1.1, and therefore do not have access to Generics or Array.Resize(). Is there a b...
hi, I'm having a bit of a problem. We have our own CMS which is using git for collaboration and versioning and stuff. Now i have two git repositories A and B, A which is a project and B which is the CMS itself. Now i want to get B into A, but when i do this i get alot of merge-conflicts and the solution for the conflicts is always to us...
Hi Is there a way to merge two exe files into one, programmatically, so that running it would execute both older exe files together. I found some things on google about injecting code or dll files but is it possible two merge two exe files or to inject exe into exe? Thanks in advance. [EDIT] Thanks everyone. Just for those who said tha...
Hi, I’m trying to change the destination of a merge module at run time... Let me explain: I have a merge module, which its destination is set to the [SystemFolder] folder. And I have a lot of MSI projects point to this one merge module, all pointing the merge module (Component) destination to ‘(Use merge module's default destination)’...
I have 3 files that are always producing merge conflicts when I am trying to merge between the baseline and my development branch in either direction. When the merge tool opens, there are no conflicts in the files and I just click ok. But it will happen again next time I merge. What can I do to get TFS to realize that NOTHING HAS CHANGE...
I need a chunk of Ruby code to combine an array of contents like such: [{:dim_location=>[{:dim_city=>:dim_state}]}, :dim_marital_status, {:dim_location=>[:dim_zip, :dim_business]}] into: [{:dim_location => [:dim_business, {:dim_city=>:dim_state}, :dim_zip]}, :dim_marital_status] It needs to support an arbitrary level of depth, ...
Here is the scenario: We have a source tree that has multiple developers working on multiple branches at any given time. We also have a 'custom' copy of this source tree with differences that will (almost) never make their way back to the main source. The development on this is continuous, but with a lot fewer changes than what's on t...
When I use git format-patch, it doesn't seem to include merges. How can I perform a merge and then e-mail it to someone as a set of patches? For example, let's say that I merge two branches and perform another commit on top of the merge: git init echo "initial file" > test.txt git add test.txt git commit -m "Commit A" git checkout -b...
Hi, Whats the best way to implement an N way merge for N sorted files? Lets say I have 9 sorted files with 10 records each? How do I merge these files to create a big file with 90 sorted records? ...
Update: I think this is related to an issue with the windows git client msysgit. Sorry to trouble you guys. http://code.google.com/p/msysgit/issues/detail?id=379&colspec=ID%20Type%20Status%20Priority%20Component%20Owner%20Summary I'm looking for a way to keep several client boxes in synch with a remote git repo. Forcing updates from...
It seems whenever I compare via the SVN Repository explorer (most recently after a merge) subclipse will show a few files in the compare window that have no differences whatsoever. Double clicking the file brings up the Java Source Compare window, but Subclipse highlights no sections and shows no differences. A manual inspection of the f...
Hi. I would like to merge from FeatureBranch to master, without doing ,,checkout master'' first. I've tried (being in FeatureBranch) git push . master but I got (to a degree of surprise) : Everything up-to-date Despite having commits in FeatureBranch which are not (yet) present in master. The reasons why I desire to be able to do...
I have checked out the various questions on this. The first provides a huge question and answer (relevant? not sure) and the second provides a wrong answer as best answer. I have a branch called great-use-this. I have another branch called master. I want to merge great-use-this into master, and avoid auto-merging conflicts. What is th...
Hi, Is there any easy way in msxml to merge two xml documents (IXMLDomDocuments)? I want to make one of the trees embedded as a child of the second one. I saw that IXMLDomDocument3 offers importNode, but couldn't get it to work correctly. Is this the way to go or is there another solution? Thanks, Dan ...
Hello, My situation: I've recently joined on the front-end side of an established project that involves a growing number of instances of a rails app, each of which which differ in some aspects (views, styling, settings etc) but which all share the majority of their back end code. Our Git repo has a number of branches looks something l...
In our case we want to igonore changes in code comment headers for generated code. In Visual Studio, we can change the merge tool (GUI that pops up) and use a 3rd party tool that is able to be customized to ignore changes (http://msdn.microsoft.com/en-us/library/ms181446.aspx). Great, so a file comparison no longer highlights code commen...
Consider a simple source-control layout, with a trunk representing a future release in development and a single branch representing a release currently in production. When a bug is discovered that needs fixed in both branches, should the change be made first to the trunk then merged down to the branch, or made first to the branch then...
I need to cut a release of our software based on the latest revision of our svn repository. But there is a set of changes that we don't want - 20 or so files that were edited a month ago and then committed all at once. I made a branch called 4.3.x from the trunk, containing all the changes we want and the 20 or so that we don't want. No...
I have been trying for a few days now to make my layouts more efficient by converting from using several levels of nested LinearLayouts to one RelativeLayout and have come across a few problems that I haven not been able to find a workaround for... I have searched the Android beginners group and this site and have not been able to find ...