add python script which can be used to automate resolving git conflicts

especially useful for many conflicts from type 'deleted by them'

just copy the script to the repo with conflicts and execute ./resolve.py