mirror of
https://git.hush.is/hush/hush3.git
synced 2025-10-09 00:06:28 -04:00
13 lines
251 B
Bash
Executable File
13 lines
251 B
Bash
Executable File
#!/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
|
|
|