Fix CSL update #7592
Merged
Fix CSL update #7592
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
|
PR is created well. We have to test the auto merge after the update is merged. The solution here did not work: https://github.hscsec.cnmunity/t/do-something-if-a-particular-label-is-set/17149/2?u=koppor, thus I tried that one: https://github.hscsec.cnmunity/t/do-something-if-a-particular-label-is-set/17149/5?u=koppor |
|
Squash merge MUST NOT be done at CSL updates - otherwise that does not work any more. I think, the other updates are only one commits large. Thus, I changed the type of the merge to |
|
This is (more or less) trial and error. Thus, I just merge and we check if it works. |
Siedlerchr
added a commit
that referenced
this pull request
Apr 9, 2021
* upstream/main: (25 commits) Fix NumberFormatException in BracketedPattern (#7600) Update MAINTAINERS (#7601) Fix CSL update (#7592) Add unit tests for org.jabref.gui classes (#7579) Squashed 'buildres/csl/csl-styles/' changes from 30fb68e..e1acabe Bump tika-core from 1.25 to 1.26 (#7589) Revert "Skip Mac OS build if secret not present (#7591)" (#7594) Optimize saving (#7568) Skip Mac OS build if secret not present (#7591) Rename master to main in dev help Update tests-fetchers.yml Update refresh-journal-lists.yml Update deployment.yml Rename master to main in coding readme Rename master to main in citation style update Rename master to main in gitversion config Fix column sort order gets overwritten (#7573) Add some hints on test tooling (#7585) Add "Update Gradle Wrapper Action" (#7584) Bump classgraph from 4.8.102 to 4.8.104 (#7587) ...
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.
Follow-up to #7306. I missed committing the update when
cpmodified a fileCHANGELOG.mddescribed in a way that is understandable for the average user (if applicable)