{"id":25,"date":"2005-09-21T01:50:05","date_gmt":"2005-09-21T05:50:05","guid":{"rendered":"http:\/\/www.rakkar.org\/blog\/?p=25"},"modified":"2005-09-21T01:50:05","modified_gmt":"2005-09-21T05:50:05","slug":"winmerge-tortoise-cvs-pretty-good","status":"publish","type":"post","link":"https:\/\/rakkar.org\/blog\/index.php\/2005\/09\/21\/winmerge-tortoise-cvs-pretty-good\/","title":{"rendered":"WinMerge + Tortoise CVS = pretty good"},"content":{"rendered":"<p>\t\t\t\tI&#8217;m setup here at home with WinMerge + Tortoise CVS and I have to say it&#8217;s pretty good.  I do have some problems.  Like when I got a clean version of an older revision and made changes I couldn&#8217;t get it to upload.  It complained about branching.   I&#8217;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?<\/p>\n<p>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.\t\t<\/p>\n","protected":false},"excerpt":{"rendered":"<p>I&#8217;m setup here at home with WinMerge + Tortoise CVS and I have to say it&#8217;s pretty good. I do have some problems. Like when I got a clean version of an older revision and made changes I couldn&#8217;t get it to upload. It complained about branching. I&#8217;m also not sure how to select merge [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":[],"categories":[2],"tags":[],"_links":{"self":[{"href":"https:\/\/rakkar.org\/blog\/index.php\/wp-json\/wp\/v2\/posts\/25"}],"collection":[{"href":"https:\/\/rakkar.org\/blog\/index.php\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/rakkar.org\/blog\/index.php\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/rakkar.org\/blog\/index.php\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/rakkar.org\/blog\/index.php\/wp-json\/wp\/v2\/comments?post=25"}],"version-history":[{"count":0,"href":"https:\/\/rakkar.org\/blog\/index.php\/wp-json\/wp\/v2\/posts\/25\/revisions"}],"wp:attachment":[{"href":"https:\/\/rakkar.org\/blog\/index.php\/wp-json\/wp\/v2\/media?parent=25"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/rakkar.org\/blog\/index.php\/wp-json\/wp\/v2\/categories?post=25"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/rakkar.org\/blog\/index.php\/wp-json\/wp\/v2\/tags?post=25"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}