From a0ee1300c34d5e6293dbfa9c37913aa7aa377fff Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Fri, 14 Jun 2013 05:58:37 +0300
Subject: [PATCH] Git: List conflicted files on stash pop conflict
Change-Id: I0dd71c928b430ca4a54034b9ddaa0d10e75ded54
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
src/plugins/git/gitclient.cpp | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 83b1e87907d..2b7fc617906 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -3003,10 +3003,13 @@ QString GitClient::synchronousTrackingBranch(const QString &workingDirectory, co
void GitClient::handleMergeConflicts(const QString &workingDir, const QString &commit,
const QStringList &files, const QString &abortCommand)
{
- Q_UNUSED(files);
-
- QString message = commit.isEmpty() ? tr("Conflicts detected")
- : tr("Conflicts detected with commit %1").arg(commit);
+ QString message;
+ if (!commit.isEmpty())
+ message = tr("Conflicts detected with commit %1").arg(commit);
+ else if (!files.isEmpty())
+ message = tr("Conflicts detected with files:\n") + files.join(QLatin1String("\n"));
+ else
+ message = tr("Conflicts detected");
QMessageBox mergeOrAbort(QMessageBox::Question, tr("Conflicts Detected"), message,
QMessageBox::NoButton, Core::ICore::mainWindow());
QPushButton *mergeToolButton = mergeOrAbort.addButton(tr("Run &Merge Tool"),
--
GitLab