Created git-resolve shell script

use the git-resolve.sh script to quickly resolve git merge conflicts via bash