Merge a25bde4 into e6353dd

bpineau · Feb 1, 2019 · a94ecac · a94ecac
2 parents e6353dd + a25bde4
commit a94ecac
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/pkg/store/git/git.go b/pkg/store/git/git.go
@@ -199,6 +199,11 @@ func (s *Store) Commit() (changed bool, err error) {
 		return false, nil
 	}
 
+	err = s.Git("pull", "-s", "recursive", "-X", "ours")
+	if err != nil {
+		return false, fmt.Errorf("failed to git pull -s recursive -X ours: %v", err)
+	}
+
 	err = s.Git("add", "-A")
 	if err != nil {
 		return false, fmt.Errorf("failed to git add -A: %v", err)