Added GIT pull before commit, fix #2

Dragonn · Dragonn · commit bf18cbe657aa · 2019-02-04T12:43:00.000+01:00
diff --git a/pkg/store/git/git.go b/pkg/store/git/git.go
@@ -234,7 +234,7 @@ func (s *Store) commitAndPush() {
 
 	err = s.Git("pull", "-s", "recursive", "-X", "ours", "--no-edit")
 	if err != nil {
-		return false, fmt.Errorf("failed to git pull -s recursive -X ours --no-edit: %v", err)
+		s.Logger.Errorf("failed to git pull -s recursive -X ours --no-edit: %v", err)
 	}
 
 	err = s.Push()

Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ func (s *Store) commitAndPush() {`
`234`	`234`
`235`	`235`	`err = s.Git("pull", "-s", "recursive", "-X", "ours", "--no-edit")`
`236`	`236`	`if err != nil {`
`237`		`- return false, fmt.Errorf("failed to git pull -s recursive -X ours --no-edit: %v", err)`
	`237`	`+ s.Logger.Errorf("failed to git pull -s recursive -X ours --no-edit: %v", err)`
`238`	`238`	`}`
`239`	`239`
`240`	`240`	`err = s.Push()`