Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add gui dialog when merge makes no changes #2551

Merged
merged 2 commits into from Jan 21, 2019
Merged

Add gui dialog when merge makes no changes #2551

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73f85ac
Add gui dialog when merge makes no changes
AlexJoss Dec 14, 2018
59afdb3
Add gui dialog when merge makes changes
AlexJoss Dec 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/gui/DatabaseWidget.cpp
View file
Open in desktop
Expand Up @@ -797,7 +797,13 @@ void DatabaseWidget::mergeDatabase(bool accepted)
}

Merger merger(srcDb.data(), m_db.data());
merger.merge();
bool databaseChanged = merger.merge();

if (databaseChanged) {
showMessage(tr("Successfully merged the database files."), MessageWidget::Information);
} else {
showMessage(tr("Database was not modified by merge operation."), MessageWidget::Information);
}
AlexJoss marked this conversation as resolved.
Show resolved Hide resolved
}

switchToMainView();
Expand Down