Commit 2e3a88b5 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Tobias Hunger
Browse files

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: default avatarTobias Hunger <tobias.hunger@digia.com>
parent ee473949
......@@ -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;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment