The merge tool that understands your code

Merging Directories

I want to merge each file in a directory (i.e. for different branches of the same code). I should be able to choose the files that I want to merge with filters (i.e. only source files, not images, etc).

88 votes
Vote
Sign in
(thinking…)
Sign in with: facebook google
Signed in as (Sign out)
You have left! (?) (thinking…)
Michael Phipps shared this idea  ·   ·  Flag idea as inappropriate…  ·  Admin →

4 comments

Sign in
(thinking…)
Sign in with: facebook google
Signed in as (Sign out)
Submitting...
  • Anonymous commented  ·   ·  Flag as inappropriate

    Most merge tools support it so it's quite a no brainer. Just do it :-)

    As a result standard command git difftool -d will not work with SemanticMerge. I've tested it successfully with AraxisMerge, P4Compare, WinMerge, Code Compare, KDiff3...)

  • Ryan commented  ·   ·  Flag as inappropriate

    It would be fantastic if you could DIFF directories.

    I make extensive use of WinMerge to diff all sorts of files, but it's kind of crazy having multiple Diff/Merge tools.

  • psantosl commented  ·   ·  Flag as inappropriate

    Michael, this is the kind of thing that your version control tool should let you do, don't you think so?

    Why don't you take a look at Plastic SCM (our version control! :-P), I think you'll find your answers there...

Feedback and Knowledge Base