For Windows OSes, winmerge [1] has been a solid free alternative to beyond compa... | Hacker News

Hacker News new | past | comments | ask | show | jobs | submit

login

gofreddygo 6 months ago | parent | context | favorite | on: LINQPad – The .NET Programmer's Playground

For Windows OSes, winmerge [1] has been a solid free alternative to beyond compare for me for years.

[1]: https://winmerge.org

xcjs 6 months ago [–]

Did they ever get around to three-way merges? That's a must-have if you use Git as a VCS.

gofreddygo 6 months ago | | [–]

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.

atVelocet 6 months ago | | [–]

Use VSCode for this. Also has three-way merge.

Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact