Step 2: navigate to the folder you want never merged from outside branches, and create a .gitattributes file where you specify all files to use the merge driver “keepmine” defined in step 1

* merge=keepmine

commit your changes, and try merging! The conflicts in the folder with .gitattributes will not register and leave the original files intact. If you want the other way around, where your branch is always overwritten by a merge, take a look at the stack post above.

I’ve now updated my environment to run off a deployment script that compiles everything needed. Luckily, only a few libraries (pyCrypto not included) have to stay in the project repo due to hacks or dev releases.