compare two .aspx files before uploading

I was wonderi开发者_Python百科ng whether there is away to compare two .aspx pages. I have a website on my local machine and the same website on a production server. What i will like to do is compare .aspx page from my local and production server to see what the differences are.

Is this possible?

---

Windiff (free) and beyond compare (commercial) will compare files and whole directories.

Most diff software will let you compare any two files and report on differences. There are many free and commercial tools out there.

They also work with UNC paths.

---

I use diffmerge by source gear, its free and very effective.

Here is the link: http://www.sourcegear.com/diffmerge/

---

Beyond Compare has native support for FTP, SFTP, and FTPS, in addition to UNC paths. You can just load your local directory one one side and an FTP URL on the other, and it will compare your entire site and let you copy files or make edits.

---

I agree with @Anish (tho I think a typo crept in) - for windows diff it has to be 'Winmerge'. Its free, open source and imo the best so far. You can get it here: http://winmerge.org

It integrates nicely with Visual Studio as an 'external Tool', instructions here: http://blog.paulbouwer.com/2010/01/31/replace-diffmerge-tool-in-visual-studio-team-system-with-winmerge/

---

Winmerge will compare the files. You can also use this tool to merge the code.