Re: Merging Visual Studio Project Files (again)

Nice! I've rarely run into this issue... but if I ever do, it sounds like
something useful to look into. :)

On 12 August 2010 13:45, Jon Watte <[email protected]> wrote:

> There's two ways of solving a problem:
> 1) work hard to solve the problem (what you did)
> 2) eliminate the problem in the first place
>
> Generally, I've had more success with 2) when it comes to project files.
> Typically, this means using something like cmake, or some home-grown script,
> to generate the project files from some easier-to-use source data. Which,
> generally, ends up being a lot easier to merge, and conflicts much less!
>
> Sincerely,
>
> jw
>
> --
> Americans might object: there is no way we would sacrifice our living
> standards for the benefit of people in the rest of the world. Nevertheless,
> whether we get there willingly or not, we shall soon have lower consumption
> rates, because our present rates are unsustainable.
>
>
>
> On Wed, Aug 11, 2010 at 8:15 AM, James Robertson <[email protected]>wrote:
>
>> We've all been there.  Some of us more than others.  Well, after being
>> stuck trying to resolve a merge with over 9000 conflicts, I finally decided
>> to do something about it.
>>
>> <ShamelessPlug>
>> Project: Merge is a tool for comparing and merging XML files.  You can
>> find it and more information at http://www.projectmerge.com
>> </ShamelessPlug>
>>
>> There's quite a bit of documentation missing at the moment, so please
>> don't hesitate to ask if you have any problems.
>>
>> Umm, that's about it really.  I hope at least some of you find it useful.
>>
>> James
>> _______________________________________________
>> Sweng-Gamedev mailing list
>> [email protected]
>>
>> http://lists.midnightryder.com/listinfo.cgi/sweng-gamedev-midnightryder.com
>>
>
>
> _______________________________________________
> Sweng-Gamedev mailing list
> [email protected]
> http://lists.midnightryder.com/listinfo.cgi/sweng-gamedev-midnightryder.com
>
>

_______________________________________________
Sweng-Gamedev mailing list
[email protected]
http://lists.midnightryder.com/listinfo.cgi/sweng-gamedev-midnightryder.com