Enable auto merge of CHANGELOG.md#10986
Merged
Merged
Conversation
Contributor
|
The build for this PR is no longer available. Please visit https://builds.jabref.org/main/ for the latest build. |
Siedlerchr
approved these changes
Mar 7, 2024
Siedlerchr
added a commit
to Frequinzy/jabref
that referenced
this pull request
Mar 13, 2024
* upstream/main: (36 commits) chore: remove repetitive words (JabRef#11015) Fix test names (JabRef#11014) Remove obsolete "Comments" tab configuration (JabRef#11011) Fix "Other fields" tab respecting custom tabs (JabRef#11012) [WIP] Extract PDF References (JabRef#10437) Fixed jump to entry from crossref (JabRef#11009) fix suggestion provider for crossref field (JabRef#10962) Use SequencedSet for required and optional fields (JabRef#11007) Bump io.github.classgraph:classgraph from 4.8.165 to 4.8.168 (JabRef#11005) Bump org.glassfish.hk2:hk2-api from 3.0.6 to 3.1.0 (JabRef#11006) Bump org.apache.logging.log4j:log4j-to-slf4j from 2.23.0 to 2.23.1 (JabRef#11003) Bump org.javamodularity.moduleplugin from 1.8.14 to 1.8.15 (JabRef#11002) Bump jakarta.xml.bind:jakarta.xml.bind-api from 4.0.1 to 4.0.2 (JabRef#11004) Bump softprops/action-gh-release from 1 to 2 (JabRef#11000) Bump gittools/actions from 0.13.2 to 0.13.4 (JabRef#11001) Update custom-svg-icons.md (JabRef#10999) Update Texworks icon (JabRef#10998) Use tags editor for auto completion preferences (JabRef#10990) Enable auto merge of CHANGELOG.md (JabRef#10986) Enhance DOI parser to deal with special characters (JabRef#10989) ... # Conflicts: # build.gradle
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
2 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.
Lines in CHANGELOG.md should be automerged by keeping both.
With our check that CHANGELOG.md entries should go into
Unreleasedonly (see https://github.com/JabRef/jabref/blame/967b6518d1b74568d270b4ac758c3ac6ffbd15c7/.github/workflows/tests.yml#L134), this auto merge should work without issues.Mandatory checks
CHANGELOG.mddescribed in a way that is understandable for the average user (if applicable)