in reply to Tool for diff'ing/analyzing two branches of same Perl code?

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
[reply]

      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]

        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]
[reply]

In Section Seekers of Perl Wisdom