Game Development

WinMerge + Tortoise CVS = pretty good

I’m setup here at home with WinMerge + Tortoise CVS and I have to say it’s pretty good. I do have some problems. Like when I got a clean version of an older revision and made changes I couldn’t get it to upload. It complained about branching. I’m also not sure how to select merge blocks with WinMerge. It seems like right now I can see the changes but have to merge them by hand?

But considering these are free tools they are quite nice. I like Tortoise CVS better than VSS in fact since it runs through Windows Explorer.

Leave a Reply

Your email address will not be published. Required fields are marked *