Fix for #320

Suppress the error when we're removing a file that may not exist

2 files changed, 3 insertions, 6 deletions

diff --git a/models/pull.go b/models/pull.go
index daed84bf22..5b54058b8d 100644
--- a/models/pull.go
+++ b/models/pull.go
@@ -712,9 +712,8 @@ func (pr *PullRequest) PushToBaseRepo() (err error) {
 	// Remove head in case there is a conflict.
 	file := path.Join(pr.BaseRepo.RepoPath(), headFile)
 
-	if err := os.Remove(file); err != nil {
-		return fmt.Errorf("Fail to remove dir %s: %v", path.Join(pr.BaseRepo.RepoPath(), headFile), err)
-	}
+	_ = os.Remove(file)
+
 	if err = git.Push(headRepoPath, tmpRemoteName, fmt.Sprintf("%s:%s", pr.HeadBranch, headFile)); err != nil {
 		return fmt.Errorf("Push: %v", err)
 	}
diff --git a/models/wiki.go b/models/wiki.go
index 890e62b0cd..89da4571db 100644
--- a/models/wiki.go
+++ b/models/wiki.go
@@ -125,9 +125,7 @@ func (repo *Repository) updateWikiPage(doer *User, oldTitle, title, content, mes
 	// So we want to make sure the symlink is removed before write anything.
 	// The new file we created will be in normal text format.
 
-	if err := os.Remove(filename); err != nil {
-		return fmt.Errorf("Fail to remove %s: %v", filename, err)
-	}
+	_ = os.Remove(filename)
 
 	if err = ioutil.WriteFile(filename, []byte(content), 0666); err != nil {
 		return fmt.Errorf("WriteFile: %v", err)