Fix file field merging #10573
Merged
Fix file field merging #10573
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add test Fixes #10572
Siedlerchr
added
the
status: ready-for-review
|
The build for this PR is no longer available. Please visit https://builds.jabref.org/main/ for the latest build. |
src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/FileMerger.java
Show resolved
Hide resolved
HoussemNasri
approved these changes
Oct 24, 2023
Siedlerchr
added a commit
to JonathanRech/jabref
that referenced
this pull request
Oct 26, 2023
* upstream/Main: openrerwrite Update .github/PULL_REQUEST_TEMPLATE.md Update PULL_REQUEST_TEMPLATE.md Update .github/PULL_REQUEST_TEMPLATE.md Update PULL_REQUEST_TEMPLATE.md Replace "fixes" by "resolves" Change JavaDoc to annotation (JabRef#10571) Fix link (JabRef#10575) Enable collecting GitHub build artifacts for forks (JabRef#10574) Fix file field merging (JabRef#10573) Update .gitignore
Siedlerchr
added a commit
to guipmenezes/jabref
that referenced
this pull request
Nov 1, 2023
* upstream/main: (419 commits) Fix CHANGELOG.md Bump commons-cli:commons-cli from 1.5.0 to 1.6.0 (JabRef#10607) Fix issue JabRef#9306: Move "Open only one instance of JabRef" preference option to somewhere else (JabRef#10602) Update README.md (JabRef#10604) Bump me.champeau.jmh from 0.7.1 to 0.7.2 Bump org.beryx.jlink from 3.0.0 to 3.0.1 Bump com.dlsc.gemsfx:gemsfx from 1.82.0 to 1.84.0 Bump org.apache.logging.log4j:log4j-to-slf4j from 2.21.0 to 2.21.1 Synchronize scrollbars in the change resolver dialog (JabRef#10587) Add button for a user to reset the cite command to the default value. (JabRef#10580) openrerwrite Update .github/PULL_REQUEST_TEMPLATE.md Update PULL_REQUEST_TEMPLATE.md Update .github/PULL_REQUEST_TEMPLATE.md Update PULL_REQUEST_TEMPLATE.md Replace "fixes" by "resolves" Change JavaDoc to annotation (JabRef#10571) Fix link (JabRef#10575) Enable collecting GitHub build artifacts for forks (JabRef#10574) Fix file field merging (JabRef#10573) ... # Conflicts: # src/main/java/org/jabref/gui/fieldeditors/identifier/IdentifierEditor.java # src/main/java/org/jabref/logic/importer/WebFetchers.java
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add test
Fixes #10572
Mandatory checks
CHANGELOG.mddescribed in a way that is understandable for the average user (if applicable)