Home Forums Programming Merge Tool

Viewing 5 reply threads
  • Author
    Posts
    • #6677
      Anonymous
      Inactive

      Hi all,

      Using Tortoise SVN (quite happily) at work for the past while. The standard diff/merge tools can be a little annoying (at first), so I did some searching.

      WinMerge, to the rescue.
      http://winmerge.org/

      It has extensions for SVN and CVS. Its simple, and free. Just thought I’d share the wealth.

      B.

    • #40716
      Anonymous
      Inactive

      Thanks for that Jediboy may well use in next project.

      I had some difficulties with toroise comparison / merge when I first used it. Had tags with "mine" and "theirs" in the saved file rather than the corresponding code sometimes when merging. Figured out what I was doing wrong fairly quickly though.

      Tortoise looks quite similar to WinMerge. What are the advantages you found?

    • #40717
      Anonymous
      Inactive

      I found the fact that you can open directories, in a "Left" and "Right" fashion, and get a simple summary via the comparison result tab.

      Also being able to filter by extension for the type of files to diff is handy (*.inl, *.h, *.cpp)

      Also from the directory comparison you can go through each file and through the context menu view the diffs of each file.

      And then there is a few features in the UI, like "copy all left" (or right), and next diff, and getting the exact diff per line.

      I know this all sounds trivial.

      I just found this a simple (and free) tool that addressed some of the pain points I had with Tortoise (which is still great in my book.)

      David:
      If I think of anything else, I’ll let you know.

    • #40719
      Anonymous
      Inactive

      No, sounds good. Thanks

    • #40721
      Anonymous
      Inactive

      Not free; but it does exactly what it says on the tin.

      http://www.araxis.com

    • #40725
      Anonymous
      Inactive

      SocksUp:

      Thanks for the link.
      I’ll give those applications a go.

      Before I got MS Project, I was using Open WorkBench (free) as a project management tool, and for a free product, it was alright.

      But Ketura looks interesting, (even at $300, its still $200 cheaper than Project…)

      thanks.

Viewing 5 reply threads
  • The forum ‘Programming’ is closed to new topics and replies.