forked from hush/hush3
jl777
6 years ago
2 changed files with 22 additions and 0 deletions
@ -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 |
|||
|
Loading…
Reference in new issue