Merge 7f6e53b into df81cd8

R-omk · web-flow · commit eb962edd39ad · 2018-04-04T15:14:15.000Z
diff --git a/git.go b/git.go
@@ -158,7 +158,7 @@ func (s *GitRepo) Update() error {
 
 // UpdateVersion sets the version of a package currently checked out via Git.
 func (s *GitRepo) UpdateVersion(version string) error {
-	out, err := s.RunFromDir("git", "checkout", version)
+	out, err := s.RunFromDir("git", "checkout", "-f", version)
 	if err != nil {
 		return NewLocalError("Unable to update checked out version", err, string(out))
 	}

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ func (s *GitRepo) Update() error {`
`158`	`158`
`159`	`159`	`// UpdateVersion sets the version of a package currently checked out via Git.`
`160`	`160`	`func (s *GitRepo) UpdateVersion(version string) error {`
`161`		`- out, err := s.RunFromDir("git", "checkout", version)`
	`161`	`+ out, err := s.RunFromDir("git", "checkout", "-f", version)`
`162`	`162`	`if err != nil {`
`163`	`163`	`return NewLocalError("Unable to update checked out version", err, string(out))`
`164`	`164`	`}`