Commit a0ee1300 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh
Browse files

Git: List conflicted files on stash pop conflict

Change-Id: I0dd71c928b430ca4a54034b9ddaa0d10e75ded54
Reviewed-by: default avatarPetar Perisin <>
Reviewed-by: default avatarTobias Hunger <>
parent e8469a2b
......@@ -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)
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"));
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"),
Markdown is supported
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