diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 7d4514bd9e3..40228fd009b 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -2102,7 +2102,7 @@ bool GitClient::synchronousPullOrRebase(const QString &workingDirectory, const Q
     const bool ok = resp.result == Utils::SynchronousProcessResponse::Finished;
     if (ok)
         GitPlugin::instance()->gitVersionControl()->emitRepositoryChanged(workingDirectory);
-    else
+    else if (resp.stdOut.contains(QLatin1String("CONFLICT")))
         handleMergeConflicts(workingDirectory, rebase);
     return ok;
 }