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

Git: Prompt to commit when merge tool finishes after merge

Browse Source 
Change-Id: I41a7e7febb77706e84595d560a8abb56a018a823
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-08-06 14:35:53 +03:00
committed by Orgad Shaneh
parent 91de546680
commit ec247074d4
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2462,6 +2462,11 @@ 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"),