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

When opening a library and a .bak file is found -> show the diff #391

Closed
Tracked by #8750
koppor opened this issue Jan 19, 2020 · 4 comments
Closed
Tracked by #8750

When opening a library and a .bak file is found -> show the diff #391

koppor opened this issue Jan 19, 2020 · 4 comments
Labels
good first issue

Comments

@koppor
Copy link
Member

koppor commented Jan 19, 2020 •
edited
Loading

Instead of just asking to load the backup, show the diff to the backup.

Use the file conflict dialog (appears when a file is changed externally).
@koppor koppor mentioned this issue Mar 13, 2020
Closed
1 task
@koppor
Copy link
Member Author

koppor commented Mar 13, 2020

If there is no diff, the dialog should not be shown.

@koppor
Copy link
Member Author

koppor commented Mar 30, 2021

Still happening on today's main build:

grafik

@koppor koppor mentioned this issue Jun 13, 2022
Closed
14 tasks
@Siedlerchr
Copy link
Member

The merge dialog should now be shown.
There needs to be warning as well:

WARNING: Restore from backup will overwrite your current library

@Siedlerchr
Copy link
Member

Duplicate of JabRef#9066

@Siedlerchr Siedlerchr marked this as a duplicate of JabRef/jabref#9066 Sep 15, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
good first issue
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@Siedlerchr @koppor