Looking for an example of a non-trivial merge conflict, to showcase FourDiff

Applications
1

Hi all,

I want to get FourDiff, a novel merge resolution UI that I’m using for years, into official Meld. I described it here, and created this MR.

In the MR, @luzpaz suggested that I make a screencast showing how to use FourDiff. The problem is that I mostly use it in my workplace, and I don’t want to publish a screencast showing resolving a merge conflict in proprietary code.

So my question is: do you have a non-trivial merge conflict that you resolved that I can use to showcase FourDiff? If you have the hashes of the git commits that you have to merge, that would be great.

<note>
I can show it on the made-up example that I created, but I suspect it would be easier to understand from a real-world example. Anyway, here’s the made-up example. Perhaps it will be good enough… WDYT?


</note>

Thanks!
Noam

1 Like