Click here to Skip to main content
13,054,018 members (75,049 online)
Rate this:
Please Sign up or sign in to vote.
See more:
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?
Posted 8-Dec-12 1:31am
Rate this: bad
Please Sign up or sign in to vote.

Solution 1

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[^]
Rate this: bad
Please Sign up or sign in to vote.

Solution 2

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

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

  Print Answers RSS
Top Experts
Last 24hrsThis month

Advertise | Privacy | Mobile
Web02 | 2.8.170713.1 | Last Updated 11 Dec 2012
Copyright © CodeProject, 1999-2017
All Rights Reserved. Terms of Service
Layout: fixed | fluid

CodeProject, 503-250 Ferrand Drive Toronto Ontario, M3C 3G8 Canada +1 416-849-8900 x 100