Just my two cents regarding this kind of problem (e.g. add-ons overwriting base files, files' version conflicts, etc.).
A local git repository may be very useful here. Simply, initialize a local Repo in Orbiter's root folder and you're done.
The ability of creating/switching branches very easily...