Re: Tool for diff'ing/anaylyzing two branches of same Perl code? (pieces)

You look at the huge pile of merge conflicts and pick a common pattern of changes. Then you apply those changes to the branch where they weren't already applied. Then you look at the new, smaller pile of merge conflicts and pick another set of changes. Repeat until resolving the merge conflict is reasonable.

- tye

Comment on Re: Tool for diff'ing/anaylyzing two branches of same Perl code? (pieces)

Replies are listed 'Best First'.
Re^2: Tool for diff'ing/anaylyzing two branches of same Perl code? (vimdiff) by tye (Sage) on Nov 18, 2015 at 19:22 UTC
Oh, and I find that this type of work can be eased by https://github.com/TyeMcQueen/vim-merge-windows. - tye	[reply]
Re^3: Tool for diff'ing/anaylyzing two branches of same Perl code? (VCSVimDiff) by jeffa (Bishop) on Nov 18, 2015 at 19:49 UTC
Why not just use VCSVimDiff via vcscommand? jeffa L-LL-L--L-LL-L--L-LL-L-- -R--R-RR-R--R-RR-R--R-RR B--B--B--B--B--B--B--B-- H---H---H---H---H---H--- (the triplet paradiddle with high-hat)	[reply]
Re^4: Tool for diff'ing/anaylyzing two branches of same Perl code? (VCSVimDiff) by Anonymous Monk on Nov 19, 2015 at 00:01 UTC
The description (& rest of the text) of vcsvimdiff did not tell me how it would be different or improve on git+vimdiff. Could you expound on that regard?	[reply]
Re^3: Tool for diff'ing/analyzing two branches of same Perl code? (kdiff3) by LanX (Saint) on Nov 30, 2015 at 12:41 UTC
Thanks, in the end I used kdiff3. Cheers Rolf _{(addicted to the Perl Programming Language and ☆☆☆☆ :) Je suis Charlie!}	[reply]


P is for Practical
	PerlMonks