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

pkp/pkp-lib#10132 move plugin validation locale key for use in omp #4359

Merged
merged 2 commits into from
Jul 15, 2024

Conversation

kaitlinnewson
Copy link
Member

No description provided.

@bozana
Copy link
Contributor

bozana commented Jul 12, 2024

@kaitlinnewson, it seems there are some conflicts with the pkp-lib submodule.
Could you please rebase again? (e.g. git fetch official, git rebase -i official/stable-3_4_0, where official should be your name for the pkp repository). Rebase first pkp-lib, then forced push it to your repository.
In applications (in this issue OJS and OMP) you would need to submit the lib/pkp submodule in an extra commit, as the last commit. At the end of commit name you would need to define your repository and branch like this: ##kaitlinnewson/10132-3_4_0##. See as an example: https://github.com/pkp/ojs/pull/4344/commits.
Thus, you would need to first reset your last commit in OJS and OMP (e.g. git reset HEAD~1), then you would need to addonly the changes from OJS locale folder (git add locale/*), and then commit them (git commit -m 'commit name'). Then rebase (as above with pkp-lib) to get the latest changes from the pkp's OJS repository. After the rebase you can use git add lib/pkp, and commit with the name like said above. Use forced push to push it all then to your GitHub repository.
Let me know if you would need any help, eventually we can do it also together...

@kaitlinnewson
Copy link
Member Author

Thanks @bozana, that was very helpful - I think I've resolved things now here and in main (no conflicts showing in 3_3_0), can you take another look?

@bozana bozana merged commit 5c00280 into pkp:stable-3_4_0 Jul 15, 2024
7 checks passed
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