If you have made changes to files and have not committed them, but then find that you need to revert the file to a the previous state and you don’t want to lose those changes, simply create a patch for the file. Save the patch file to the same directory and now you have captured your changes since the last commit. Now, revert your changes, make the necessary changes to the project and then apply the patch to get your changes back into the file. If you have to make changes to the files you patched, then you may have some manual work to do there, but if not, you should be golden.
