I'm currently using Beyond Compare v3 and have had no problems up until now. Usually it is just a matter of copying the new data across to the other document by clicking the small yellow arrow which pushes it to the other side, combining the document. The problem that I have started to notice is that certain files have large blocks of code which cannot simply be pushed to the other file as it will copy over a lot of code already in the file. I was wondering how you handle this?
I understand that this is probably different on a file to file basis however I am at a complete loss.
The particular file I am referring to is the your_template/common/html_header.php whilst attemting to install the css/js loader