Re: managing visual studio project files in branches

Noam Tamim wrote:
> Since there's no easy (automatic) way to merge VS project files, let's
> think of them as binary files. What would you do then? Or is it just
> impossible?

Are you hand-editing the project files?

We merge vs.net project files all the time. Sometimes we get conflicts,
but they're never too hard to straighten out. It's XML, so it's pretty
easy to know if you got something wrong.

Mark

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Nov 23 16:30:20 2005