I use Beyond Compare with great luck. I do complete rebuilds when I'm really tired of whatever look is there now but for minor upgrades it's BC everytime.
Donate to UBBDev today to help aid in Operational, Server and Script Maintenance, and Development costs.
Please also see our parent organization VNC Web Services if you're in the need of a new UBB.threads Install or Upgrade, Site/Server Migrations, or Security and Coding Services.