From 2e3a88b5ec21b9c7888ab8b157c3f12405ac5c3b Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Thu, 20 Dec 2012 20:24:07 +0200 Subject: [PATCH] Git: Only handle conflicts after rebase if they are present rebase might fail for other reasons (detached head, unconfigured upstream...) Change-Id: If80844dcbfd4f61fdd44d77f934e86ff96f0a1d3 Reviewed-by: Tobias Hunger --- src/plugins/git/gitclient.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; }