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

Git: Fix popup message for merge

Browse Source 
Change-Id: Ie3ef79343b84d615255b70b786347c57511c3309
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Petar Perisin
2013-10-05 16:10:54 +02:00
parent 36e6a70505
commit ab71755326
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2665,11 +2665,6 @@ void GitClient::continueCommandIfNeeded(const QString &workingDirectory)
{ {
CommandInProgress command = checkCommandInProgress(workingDirectory); CommandInProgress command = checkCommandInProgress(workingDirectory);
switch (command) { switch (command) {
case Merge:
continuePreviousGitCommand(workingDirectory, tr("Continue Merge"),
tr("Merge is in progress. What do you want to do?"),
tr("Continue"), QLatin1String("merge"));
break;
case Rebase: case Rebase:
case RebaseMerge: case RebaseMerge:
continuePreviousGitCommand(workingDirectory, tr("Continue Rebase"), continuePreviousGitCommand(workingDirectory, tr("Continue Rebase"),
@@ -2677,6 +2672,11 @@ void GitClient::continueCommandIfNeeded(const QString &workingDirectory)
tr("Continue"), QLatin1String("rebase"), tr("Continue"), QLatin1String("rebase"),
command != RebaseMerge); command != RebaseMerge);
break; break;
case Merge:
continuePreviousGitCommand(workingDirectory, tr("Continue Merge"),
tr("You need to commit changes to finish merge.\nCommit now?"),
tr("Commit"), QLatin1String("merge"));
break;
case Revert: case Revert:
continuePreviousGitCommand(workingDirectory, tr("Continue Revert"), continuePreviousGitCommand(workingDirectory, tr("Continue Revert"),
tr("You need to commit changes to finish revert.\nCommit now?"), tr("You need to commit changes to finish revert.\nCommit now?"),