How to quickly switch between two versions of a file
It sounds like you need to have the files open in an editor that will display both files at once or have windows for each file. 2 editors I know of are Atom and Visual Studio Code. These editors allow you to display 2 files side-by-side and you can edit whichever one you want.