Hush Full Node software. We were censored from Github, this is where all development happens now.
https://hush.is
You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
13 lines
251 B
13 lines
251 B
6 years ago
|
#!/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
|
||
|
|