From a2f5ba6e787c95d0cd8efb87e1afff007b5a5fee Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Sat, 19 Sep 2015 11:49:37 -0400
Subject: [PATCH] script

---
 dmaPush.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dmaPush.sh b/dmaPush.sh
index ba4a605e..0875c821 100755
--- a/dmaPush.sh
+++ b/dmaPush.sh
@@ -6,4 +6,7 @@ git fetch upstream
 git merge upstream/master
 git push origin master
 cd ~/Research/CBAStuff/git/archives/dma
+git fetch origin
+git merge origin/master
 git subtree pull -P Web/dmdesign fabpeople:people/amanda.ghassaei/dmdesign master --squash
+git push origin master
-- 
GitLab