There are numerous way to compare, modify, etc. two like files on Windows however using the application WinMerge will make things much easier. In the past I have opened the two files in Notepad or Notepad++, compared them, and then made the necessary changes. WinMerge is open source and created specifically for comparing similar files. There are so many benefits to using WinMerge including the ability to compare like folders (and their contents), save both files as projects, visually see location in files during the process, easily merge files, and many more. Below is a screenshot of what WinMerge looks like when comparing two PHP files.
Recently I was upgrading various WordPress plugins one of which was the WP Block Admin plugin. This plugin will redirect all users with certain permissions away from the default /wp-admin directory back to the homepage after login. This is beneficial if most of your users only have to login for a forum or for comments on WP posts. After upgrading the plugin I noticed it was no longer working. I went through the below steps to resolve the problem.
First off the configuration file for this plugin is very simple thus making it an easy problem to resolve. The plugin is located in the /wp-content/plugins/ sub directory in a folder called wp-block-admin and besides a readme file there is only one PHP file located in this directory called wp-block-admin.php. Besides the commenting (including version number) at the top of the file the only other difference in the file was on line 33.