pkp-lib
pkp-lib copied to clipboard
pkp/pkp-lib#10090 Ensure anonymity in discussions for double blind reviews
@Hafsa-Naeem, is the PR ready? If yes, can you update it?
@Vitaliy-1 Yes, I've made the necessary changes based on your feedback. The PR is now updated and ready for your review, let me know if anything else is needed.
It still has conflicts with the QueryForm, can you rebase it locally on top of the main, and ping me to merge? E.g. (depending on your setup):
git checkout main
git pull upstream main
depending on what main you are tracking, e.g., you can also update your own own fork's main in the Github interface
git checkout main
git pull origin main
You can always check what branch is tracked by:
git status
git remote -v
And then do rebase and deal with conflicts:
git checkout reviewer_anonimity_bug
git rebase -i main
git push --force
@Vitaliy-1 Thank you. I have resolved the conflicts and rebased the branch on top of the main. Please review.
I don't see any changes comparing with the current main. Probably something got lost during rebase. Can you double check please?
@Vitaliy-1 I’ve fixed the rebase issues and the changes. Please review. Thanks!
Thanks! I left comments, I think there is a method that was added to the StageAssignment by mistake