Comments | quikchange: Merging code from different branches

quikchange

Merging code from different branches

Mar 21, 2006 10:34

I've been trying to merge code changes between 2 branches and it's proving to be an extremely frustrating experience because I don't have any tools to make it easier. Araxis Merge is reportedly amazing but it only runs on Windows and I don't want to deal with the near-useless command shell and terminal window available on Windows. Perforce, which ( Read more... )

vmware, geeky

Comments 5

Meld, KDiff3 grosskur March 25 2006, 23:13:34 UTC

Either Meld or KDiff3 might be worth a shot.

Re: Meld, KDiff3 quikchange March 25 2006, 23:22:33 UTC

I don't want to taint my lovely Gnaome desktop with a KDE tool but Meld sounds very promising. I'm definately going to give it a shot on Monday. I hope it gets along well with Perforce.

Re: Meld, KDiff3 quikchange March 27 2006, 18:39:33 UTC

I can't seem to find an RPM pkg of Meld for SuSE 10 :-(

Re: Meld, KDiff3 grosskur March 27 2006, 19:24:11 UTC

Hmmm... I thought you were running Ubuntu?

Anyways, if you can get pygtk>=2.6.0 and gnome-python>=2.6.0 (and optionally pygtksourceview>=0.9 for source highlighting) installed, you should be able to just unpack the meld tarball somewhere (e.g. your home directory) and run it from there.

Thread 5