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

Git: List conflicted files on stash pop conflict

Browse Source 
Change-Id: I0dd71c928b430ca4a54034b9ddaa0d10e75ded54
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-06-14 05:58:37 +03:00
committed by Orgad Shaneh
parent e8469a2bab
commit a0ee1300c3
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3003,10 +3003,13 @@ QString GitClient::synchronousTrackingBranch(const QString &workingDirectory, co
void GitClient::handleMergeConflicts(const QString &workingDir, const QString &commit, void GitClient::handleMergeConflicts(const QString &workingDir, const QString &commit,
const QStringList &files, const QString &abortCommand) const QStringList &files, const QString &abortCommand)
{ {
Q_UNUSED(files); QString message;
if (!commit.isEmpty())
QString message = commit.isEmpty() ? tr("Conflicts detected") message = tr("Conflicts detected with commit %1").arg(commit);
: 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 mergeOrAbort(QMessageBox::Question, tr("Conflicts Detected"), message,
QMessageBox::NoButton, Core::ICore::mainWindow()); QMessageBox::NoButton, Core::ICore::mainWindow());
QPushButton *mergeToolButton = mergeOrAbort.addButton(tr("Run &Merge Tool"), QPushButton *mergeToolButton = mergeOrAbort.addButton(tr("Run &Merge Tool"),