- #!/bin/bash
- FILE="../patches/${1}.patch"
- cd vscode || { echo "'vscode' dir not found"; exit 1; }
- git apply --reject "${FILE}"
- read -p "Press any key when the conflict have been resolved..." -n1 -s
- git diff -U1 > "${FILE}"
- cd ..
- echo "The patch has been generated."
|