Will a reset do the trick...?

2018-04-04 09:45:07 +01:00 · 2018-04-04 09:45:07 +01:00 · 4bf65b1bb2
parent aa5f2d1d8b
commit 4bf65b1bb2
1 changed files with 6 additions and 1 deletions
--- a/updater/main.go
+++ b/updater/main.go
@ -64,7 +64,12 @@ func updater(scanner *bufio.Scanner) bool {
 	if err == git.NoErrAlreadyUpToDate {
 		fmt.Println("You are already up-to-date")
 		return true
-	} else if err != nil {
+	} else if err != nil && err != git.ErrUnstagedChanges { // fixes a bug in git where it refuses to update the files
+		return logError(err)
+	}
+
+	err = workTree.Reset(&git.ResetOptions{Mode: git.MergeReset})
+	if err != nil {
 		return logError(err)
 	}