Beyond Compare https://www.scootersoftware.com/ https://www.scootersoftware.com/ Especially with integrated source control and remote sessions to manage sourc

Beyond Compare https://www.scootersoftware.com/ https://www.scootersoftware.com/ Especially with integrated source control and remote sessions to manage source on multiple server types and platforms. Very customizable rules for compares and folder structure / filename case etc. I used to use Araxis Merge, but Beyond Compare, with a tiny bit of customization, is in my opinion a far superior tool.