Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hotfix: Always create a PR for updating journal lists #10138

Merged
merged 1 commit into from
Aug 2, 2023
Merged

Conversation

koppor
Copy link
Member

@koppor koppor commented Aug 2, 2023

Our .mv file gets updated too often. I don't see, why.

Thus adapting the workflow not to commit and push, but always to create a PR.

Mandatory checks

  • Change in CHANGELOG.md described in a way that is understandable for the average user (if applicable)
  • Tests created for changes (if applicable)
  • Manually tested changed features in running JabRef (always required)
  • Screenshots added in PR description (for UI changes)
  • Checked developer's documentation: Is the information available and up to date? If not, I outlined it in this pull request.
  • Checked documentation: Is the information available and up to date? If not, I created an issue at https://github.com/JabRef/user-documentation/issues or, even better, I submitted a pull request to the documentation repository.

@Siedlerchr
Copy link
Member

Apparently there were merge conflicts in the csl file

@koppor
Copy link
Member Author

koppor commented Aug 2, 2023

PR created at #10139. Thus, works.

@koppor
Copy link
Member Author

koppor commented Aug 2, 2023

I did not update that file. Don't know, why this appears now - and not in #10136

@koppor koppor merged commit 85d1b1c into main Aug 2, 2023
8 of 12 checks passed
@koppor koppor deleted the koppor-patch-1 branch August 2, 2023 06:27
@github-actions
Copy link
Contributor

github-actions bot commented Aug 2, 2023

The build for this PR is no longer available. Please visit https://builds.jabref.org/main/ for the latest build.

@Siedlerchr
Copy link
Member

I think we merged the conflict checker after the csl update

@koppor
Copy link
Member Author

koppor commented Aug 2, 2023

I think we merged the conflict checker after the csl update

This is why I wonder. If it is NOW a conflict in this PR (based on latest main), there should have been a conflict when the checker was added (also based on the latest main back then).

@Siedlerchr
Copy link
Member

Or maybe it was the other way round

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants