Life has gotten a lot easier for me trying to manage multiple branches of D since I've been using file compare/merge tools.

I use winmerge for Windows, and meld for Linux. They are both free, and work great.

What do you use?

On Monday, 1 April 2013 at 19:53:23 UTC, Walter Bright wrote:
> Life has gotten a lot easier for me trying to manage multiple branches of D since I've been using file compare/merge tools.
>
> I use winmerge for Windows, and meld for Linux. They are both free, and work great.
>
> What do you use?

I just use WinMerge when necessary but I mostly use `git diff` day to day.

On 4/1/13 3:53 PM, Walter Bright wrote:
> Life has gotten a lot easier for me trying to manage multiple branches
> of D since I've been using file compare/merge tools.
>
> I use winmerge for Windows, and meld for Linux. They are both free, and
> work great.
>
> What do you use?

It's a good discussion. Love meld but OSX installation is tenuous so I gave up on it. This morning I installed Octosplit (http://goo.gl/sgNWw) on Chrome this morning, it took seconds and it made diff viewing a lot better.

Andrei

On Monday, 1 April 2013 at 19:53:23 UTC, Walter Bright wrote:
> Life has gotten a lot easier for me trying to manage multiple branches of D since I've been using file compare/merge tools.
>
> I use winmerge for Windows, and meld for Linux. They are both free, and work great.
>
> What do you use?

I use fugitive for Vim.
https://github.com/tpope/vim-fugitive

But I haven't learned much of it and probably could benefit from meld (I've never used).

On Mon, 01 Apr 2013 12:53:23 -0700
Walter Bright <newshound2@digitalmars.com> wrote:

> Life has gotten a lot easier for me trying to manage multiple branches of D since I've been using file compare/merge tools.
> 
> I use winmerge for Windows, and meld for Linux. They are both free, and work great.
> 
> What do you use?

I've been using Beyond Compare <http://www.scootersoftware.com/> for over ten years now. Can't live without it, and wouldn't want to anyway ;) Heck, I use it a lot even for non-development purposes.

On Monday, 1 April 2013 at 20:36:08 UTC, Nick Sabalausky wrote:
> On Mon, 01 Apr 2013 12:53:23 -0700
> Walter Bright <newshound2@digitalmars.com> wrote:
>
>> Life has gotten a lot easier for me trying to manage multiple
>> branches of D since I've been using file compare/merge tools.
>> 
>> I use winmerge for Windows, and meld for Linux. They are both free,
>> and work great.
>> 
>> What do you use?
>
> I've been using Beyond Compare <http://www.scootersoftware.com/> for
> over ten years now. Can't live without it, and wouldn't want to
> anyway ;) Heck, I use it a lot even for non-development purposes.

kompare and (depending on machine) kdiff3. They only compare files though.

I'm using vimdiff if working over ssh.

Also for OS X: http://www.kaleidoscopeapp.com/

On 4/1/13, Nick Sabalausky <SeeWebsiteToContactMe@semitwist.com> wrote:
> I've been using Beyond Compare <http://www.scootersoftware.com/>

Me too.

And the obligatory tip for anyone trying to use it with Git:

Add this to your .gitconfig file (and make sure you're setting the path to BCompare.exe and not BComp.exe):

[diff]
	tool = bc3
[difftool "bc3"]
	path = C:/program files/beyond compare 3/BCompare.exe

And some aliases for .bashrc I use myself:

alias bdiff='git difftool --dir-diff'
alias bcdiff='git difftool --dir-diff --cached'
alias bhdiff='git difftool --dir-diff head~1'

http://www.devart.com/codecompare/
It's hoggy, but has syntax highlighting and nice interface.

On Mon, 01 Apr 2013 12:53:23 -0700, Walter Bright <newshound2@digitalmars.com> wrote:

> Life has gotten a lot easier for me trying to manage multiple branches of D since I've been using file compare/merge tools.
>
> I use winmerge for Windows, and meld for Linux. They are both free, and work great.
>
> What do you use?

I use meld on Linux and Windows. I find it easier to have one solution that works the same across the platforms I work on.

-- 
Adam Wilson
IRC: LightBender
Project Coordinator
The Horizon Project
http://www.thehorizonproject.org/