News for hackers. Stuff that matters.

A comment on LINQPad – The .NET Programmer's Playground. Parent comment

Re:LINQPad – The .NET Programmer's Playground by gofreddygo on Monday June 24, 2024 @02:18PM (#40779150)
For Windows OSes, winmerge [1] has been a solid free alternative to beyond compare for me for years.

[1]: https://winmerge.org

[ Parent | on HN ]
Re:LINQPad – The .NET Programmer's Playground by xcjs on Monday June 24, 2024 @03:33PM (#40779768)
Did they ever get around to three-way merges? That's a must-have if you use Git as a VCS.
[ Parent | on HN ]
Re:LINQPad – The .NET Programmer's Playground by atVelocet on Wednesday June 26, 2024 @01:46AM (#40796788)
Use VSCode for this. Also has three-way merge.
[ Parent | on HN ]
Re:LINQPad – The .NET Programmer's Playground by gofreddygo on Thursday June 27, 2024 @12:09PM (#40812069)
I dont know. I Never use three way merges for anything productive.

Always felt three way merges were a great way to melt human brains.

[ Parent | on HN ]