Commit ab717553 authored by Petar Perisin's avatar Petar Perisin
Browse files

Git: Fix popup message for merge



Change-Id: Ie3ef79343b84d615255b70b786347c57511c3309
Reviewed-by: default avatarOrgad Shaneh <orgads@gmail.com>
Reviewed-by: default avatarAndré Hartmann <aha_1980@gmx.de>
Reviewed-by: default avatarLeena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent 36e6a705
...@@ -2665,11 +2665,6 @@ void GitClient::continueCommandIfNeeded(const QString &workingDirectory) ...@@ -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) ...@@ -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?"),
......
Supports Markdown
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