First attempt for showing merge dialog in panel

* upstream/master:
  Fix eclipse classpath build file
  New translations JabRef_en.properties (French) (#5709)
  Check for existing master branch
  Disable failing MathSciNet test due to missing subscription
  Try to force creating reflog
  Change travis to github in Readme
  Use GitVersion to increment build numbers (#5682)
  New Crowdin translations (#5687)
  Bump checkstyle from 8.26 to 8.27 (#5694)
  Bump byte-buddy-parent from 1.10.3 to 1.10.4
  Bump classgraph from 4.8.54 to 4.8.58
  Bump unirest-java from 3.1.04 to 3.2.00
  Bump richtextfx from 0.10.2 to 0.10.3
  Bump mockito-core from 3.1.0 to 3.2.0
  Update JavaFX (#5690)
  Run outdated dependency check after dpendabot
  Update outdatedDependencies.md

* upstream/master:
  Add throttle to AutosaveUIManager (#5680)
  Do not couple search position to sidebar width (#5716)
  fix springer fetcher tests
  Bump controlsfx from 11.0.0 to 11.0.1 (#5714)
  Add CHANGELOG.md entry for Oracle
  Enable oracle tests (#5683)

* upstream/master: (21 commits)
  New Crowdin translations (#5729)
  Update license of Oracle JDBC
  Changes string representation when detecting custom entry types. (#5741)
  Try to fix GitVersion
  Also run workflow on tag creation
  Add README.md with an initial help to work on command line para… (#5720)
  Bugfix for Multiscreen (#5738)
  Fix #2868 - keep source groups selected after drag and drop
  retrigger build
  Squashed 'src/main/resources/csl-styles/' changes from f71cd32..49a1841
  try to fix pull of csl styles
  try to fix csl update
  Fixed untranslated Strings issue #5701
  Fix #5603 - account for file extension in file name length (#5726)
  New translations JabRef_en.properties (French)
  Bump unirest-java from 3.2.00 to 3.3.00
  Bump postgresql from 42.2.8 to 42.2.9
  Bump tika-core from 1.22 to 1.23
  Fix upload to GitHub artifacts (#5712)
  Try to fix csl update (#5718)
  ...

# By Tobias Diez (11) and others
# Via GitHub (1) and Tobias Diez (1)
* upstream/master: (29 commits)
  Improve things arround change detection (#5770)
  Revert "Update to most recent journal abbreviation list" (#5769)
  Various fixes to the dark theme (#5764)
  Bump mockito-core from 3.2.0 to 3.2.4 (#5760)
  Bump classgraph from 4.8.58 to 4.8.59 (#5761)
  Improve dependency update rules
  Update jpackage to build 27 (#5758)
  Persistent column sortorder (#5730)
  Fix medline fetcher/importer when using installer (#5752)
  New Crowdin translations (#5751)
  Bump byte-buddy-parent from 1.10.4 to 1.10.5 (#5750)
  Fix checkstyle
  Fix filename
  Update to most recent journal abbreviation list
  Remove obsolete string
  Revert "Switch back to development"
  Switch back to development
  Next development cycle
  Release 5.0-beta (#5684)
  Fix multiple entries allowed in crossref (issue #5284) (#5724)
  ...

# Conflicts:
#	src/main/java/org/jabref/gui/collab/ChangeDisplayDialog.java
#	src/main/java/org/jabref/gui/collab/EntryChangeViewModel.java

fix deleted entry

* upstream/master:
  Fixes StringIndexOutOfBoundsException when cutting text (#5776)
  Bump org.beryx.jlink from 2.16.4 to 2.17.0 (#5782)
  Bump byte-buddy-parent from 1.10.5 to 1.10.6 (#5783)
  Fix line endings.
  Try to use implicit shell to enable variable correctly be set
  Fix branch name detection
  Update script to absolute path and new username
  Revert "Disable non-working cleanup_pr workflow"
  Switch to rsync (#5778)
  Fix Medline tests (#5774)
  Normalize line ending in test file (#5775)
  Fix Springer fetcher tests (#5773)
  Fix code style (#5772)

change labels and preselegt right side
Select first change

fix l10n

Update arrows

use jabref icons instead of unicode

* upstream/master:
  Improve ignored dependencies
  Run tests also on PR
  Add latex2unicode formatter for displaying previews (#5785)