Is there a sensible way to merge Visual Studio project files (.csproj) between branches?

Question

Once again I having to merge code between branches and the textual merge tool is finding a lot of conflict in the project files.

I expect that a tool that understood a project file (files add/removed and compile options changed) could do the 3 way merge with ease.

Is there such a tool?

(For better or for worse, we have long lived branches paid for (and controlled) by different customers, as well as the “main” branch for all new customer, so continuous integration is not an option at present.)

score 1 · Answer 1 · edited Oct 24 '11 at 14:22

1

Have a look at:

Tools for SLN file (Visual Studio Solution file) http://slntools.codeplex.com/

and Project Merge (€19 per user) http://www.projectmerge.com/index.php

edited Oct 24 '11 at 14:22

Ian Ringrose

51,220
55
213
317

answered Oct 24 '11 at 11:18

Perhentian

860
8
12

"As of 2016-01-20 Project: Merge is officially a discontinued product and we are therefore no longer selling new licences." – Tony O'Hagan Nov 09 '16 at 00:27

score 0 · Answer 2 · answered Nov 02 '12 at 17:09

0

I think, you can at least try Altova DiffDog, which is XML-aware differ-editor. Not cheap, but power and flexible

answered Nov 02 '12 at 17:09

Lazy Badger

94,711
9
78
110

Is there a sensible way to merge Visual Studio project files (.csproj) between branches?

2 Answers2