Skip to content

Commit

Permalink
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions tool/truffle/merge.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/bin/sh

git merge --no-commit origin/master

# git reset appveyor.yml
git rm -f appveyor.yml

for f in .travis.yml ci.hocon; do
git reset $f
git checkout $f
done

0 comments on commit 39c79f3

Please sign in to comment.