fix: reduce mangle to minimum

This commit is contained in:
Baptiste Augrain
2023-01-31 14:33:29 +01:00
parent 4afe89a9ce
commit 4b4cfe4f74
5 changed files with 49 additions and 23 deletions

View File

@@ -15,8 +15,12 @@ if [[ -f "${FILE}" ]]; then
git apply --reject "${FILE}"
fi
git apply --reject "../patches/helper/settings.patch"
read -p "Press any key when the conflict have been resolved..." -n1 -s
git restore .vscode/settings.json
git add .
git diff --staged -U1 > "${FILE}"