Merge pull request #73 from Dragonn/fix-issue-72

Added GIT pull before commit
bpineau · Jul 6, 2019 · 327d5c1 · 327d5c1
2 parents e6353dd + bf18cbe
commit 327d5c1
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/pkg/store/git/git.go b/pkg/store/git/git.go
@@ -232,6 +232,11 @@ func (s *Store) commitAndPush() {
 		return
 	}
 
+	err = s.Git("pull", "-s", "recursive", "-X", "ours", "--no-edit")
+	if err != nil {
+		s.Logger.Errorf("failed to git pull -s recursive -X ours --no-edit: %v", err)
+	}
+
 	err = s.Push()
 	if err != nil {
 		s.Logger.Errorf("%v", err)