Hide diffs when one of the field values is blank a.k.a no conflict#9110
Merged
Hide diffs when one of the field values is blank a.k.a no conflict#9110
Conversation
Member
|
Failing tests are not related |
Siedlerchr
added
the
status: ready-for-review
Siedlerchr
approved these changes
Sep 1, 2022
koppor
approved these changes
Sep 1, 2022
Member
|
Thank you for fixing this. Nevertheless, I would like to ask for working on the colors. See following example:
|
Siedlerchr
added a commit
that referenced
this pull request
Sep 2, 2022
* upstream/main: (387 commits) Show a warning in the merge dialog when authors are the same but formatted differently (#9088) Fix subdatabase from aux on cli (#9117) Visual improvements to LinkedFilesEditor (#9114) SLR Remove "last-search-date" (#9116) Hide diffs when one of the field values is blank a.k.a no conflict (#9110) Squashed 'buildres/csl/csl-locales/' changes from e637746677..b2afeb4d87 Squashed 'buildres/csl/csl-styles/' changes from c750b6e..8d69f16 Fix title case capitalization after en-dash characters (#9102) Update journal abbrev list (#9109) Fix CSL rendering in case of article (#8607) [WIP][GSOC22] - C - Improve the external changes resolver dialog (#9021) Bump jsoup from 1.15.1 to 1.15.3 (#9103) Bump checkstyle from 10.3.2 to 10.3.3 (#9104) Bump postgresql from 42.4.2 to 42.5.0 (#9105) Bump unirest-java from 3.13.10 to 3.13.11 (#9106) Include check for TimeStamp (#9089) Close OO connection on JabRef exit (#9076) Bump slf4j-tinylog from 2.4.1 to 2.5.0 (#9085) Bump bcprov-jdk18on from 1.71 to 1.71.1 (#9079) Bump tinylog-impl from 2.4.1 to 2.5.0 (#9086) ... # Conflicts: # src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java # src/main/java/org/jabref/gui/util/DefaultTaskExecutor.java # src/main/java/org/jabref/logic/shared/DBMSSynchronizer.java
Siedlerchr
added a commit
that referenced
this pull request
Sep 3, 2022
…nto linkedFilesfixesRelative * 'linkedFilesfixesRelative' of github.com:JabRef/jabref: (52 commits) Enable files/files Don't show the info button when the authors field content is identical (#9128) "study.yml" is static now (#9125) fix l10n Compile fix Fix parsing of JabRef v5.7 study.yml files (#9124) Fix integrity check for tilde accents in author names (#9097) Rework the Define study parameters dialog (#9123) Fix parsing of save actions (#9122) Fix exception that occurs when saving name formatters (#9121) Refine code for BibEntry#replaceDownloadedFile (#9118) Show a warning in the merge dialog when authors are the same but formatted differently (#9088) Fix subdatabase from aux on cli (#9117) Visual improvements to LinkedFilesEditor (#9114) SLR Remove "last-search-date" (#9116) Hide diffs when one of the field values is blank a.k.a no conflict (#9110) Squashed 'buildres/csl/csl-locales/' changes from e637746677..b2afeb4d87 Squashed 'buildres/csl/csl-styles/' changes from c750b6e..8d69f16 Fix title case capitalization after en-dash characters (#9102) Update journal abbrev list (#9109) ...
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
context: Show Diff: Split View: I would think again of the colors: red means removal in my experience - can another color be used? -- I would see both first two columns as input for the Merged Entry. Thus, I am a bit confused by using red as color at the "Original Entry"
Originally posted by @koppor
Screenshots
CHANGELOG.mddescribed in a way that is understandable for the average user (if applicable)