feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Git: Only handle conflicts after rebase if they are present

Browse Source 
rebase might fail for other reasons (detached head, unconfigured upstream...)

Change-Id: If80844dcbfd4f61fdd44d77f934e86ff96f0a1d3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2012-12-20 20:24:07 +02:00
committed by Tobias Hunger
parent ee4739491a
commit 2e3a88b5ec
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/git/gitclient.cpp
View File

@@ -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;
}