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

Git: Handle "no changes" case on conflict resolving

Browse Source 
Change-Id: I75bb18c9564ffac3de2654bd388465794481b487
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-02-09 20:33:50 +02:00
committed by Orgad Shaneh
parent c68adbf9c0
commit 34fd5ca532
4 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2132,10 +2132,10 @@ bool GitClient::synchronousPull(const QString &workingDirectory, bool rebase)
return executeAndHandleConflicts(workingDirectory, arguments, abortCommand);
}
bool GitClient::synchronousCommandContinue(const QString &workingDirectory, const QString &command)
bool GitClient::synchronousCommandContinue(const QString &workingDirectory, const QString &command, bool hasChanges)
{
QStringList arguments;
arguments << command << QLatin1String("--continue");
arguments << command << QLatin1String(hasChanges ? "--continue" : "--skip");
return executeAndHandleConflicts(workingDirectory, arguments, command);
}