managing visual studio project files in branches

Hi.

We recently moved from VSS to SVN. The move was great, everybody's happy,
and now we're starting to use the more advanced features - mainly branching
and merging.

Our VS.Net project files (these are extremely verbose XML files, that
contain all configuration and file information of the project) are under
source control (this is how it was with VSS, so we just went on with it). We
have added the needs-lock property to these files - so while everyone works
on the trunk, we're fine.

A problem arises when branching.
1. A user creates a branch of the tree (copies the trunk).
2. That user adds a new VS configuration. VS adds a few XML elements to many
places in the project file. It also changes some other stuff.
3. Someone working on the trunk also adds a configuration.
4. The branch user wants to merge his changes into the trunk. The code
merges fine, but the project files are conflicted: SVN doesn't know how to
deal with the change.

What do other teams do with that? In VSS we didn't have that problem simply
because we never branched.

Thanks in advance,
Noam.
Received on Mon Nov 21 21:59:41 2005