notarization check for asset chains

This commit is contained in:
jl777
2018-09-17 01:04:30 -11:00
parent 7fe2cd8324
commit 12832b1d22
2 changed files with 22 additions and 0 deletions

12
resolve.sh Executable file
View File

@@ -0,0 +1,12 @@
#!/bin/bash
for f in $(git diff --name-only --diff-filter=U | cat); do
echo "Resolve conflict in $f ..."
git checkout --theirs $f
done
for f in $(git diff --name-only --diff-filter=U | cat); do
echo "Adding file $f ..."
git add $f
done