Fix patch conflicts

2017-01-15 10:05:31 -07:00 · 2017-01-15 10:05:31 -07:00 · d7cfd8cf29
commit d7cfd8cf29
parent 137ece1d33
1 changed files with 15 additions and 0 deletions
--- a/mergeUpstream.sh
+++ b/mergeUpstream.sh
@ -0,0 +1,15 @@
+
+PS1="$"
+basedir=`pwd`
+
+function update {
+    cd "$basedir/$1"
+    git fetch && git reset --hard origin/master
+    cd "$basedir/$1/.."
+    git add $1
+}
+
+update Waterfall
+
+# Update submodules
+git submodule update --recursive