910918 - How to merge VDPROJ files?

Question

0.00/5 (No votes)

See more:

VS2010

hi we use SVN in a team work. in the solution there's a project for building MSI file called Setup. the project is indeed a vdproj file.
i've changed Setup.vdproj and found that someone else also changed it and committed the changes before me. so i've to Update, but the SVN itself can't merge them via Update properly (i think so, failure will happen, no?) and i myself can't merge it when it's shown in text mode. there're lots of numbers (GUIDs) there. so i need a visual way to merge my changes with others.
how can i do that?
what's ur idea?
thx

Posted 8-Dec-12 1:31am

ilostmyid2

Add a Solution

2 solutions

Solution 2

به این میگن یه جواب مختصر و مفید
ممنون

Posted 10-Dec-12 18:06pm

ilostmyid2

Add a Solution

Add your solution here

Treat my content as plain text, not as HTML

Preview 0

…

Existing Members

Sign in to your account

...or Join us

Download, Vote, Comment, Publish.

Your Email
Password
Forgot your password?

Your Email
This email is in use. Do you need your password?
Optional Password

I have read and agree to the Terms of Service and Privacy Policy
Please subscribe me to the CodeProject newsletters

When answering a question please:

Read the question carefully.
Understand that English isn't everyone's first language so be lenient of bad spelling and grammar.
If a question is poorly phrased then either ask for clarification, ignore it, or edit the question and fix the problem. Insults are not welcome.
Don't tell someone to read the manual. Chances are they have and don't get it. Provide an answer or move on to the next question.

Let's work to help developers, not make them feel stupid.

This content, along with any associated source code and files, is licensed under The Code Project Open License (CPOL)

yaser shadmehr · Accepted Answer · 2012-12-10T17:59:00

Unfortunately, setup projects (vdproj) don't have an ideal experience for source control integration. WIX (Windows Installer XML) is better than.
And for your problem , you should convert both of vdproj to wix and compare them.

How to convert vdproj file to wix format[^]

Automate Releases With MSBuild And Windows Installer XML[^]