Resolving conflicts when merging develop_2024_58b branch into W2025-29 branch #834
Conversation
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
This reverts commit 7000c88.
* stash1 * settings.json * pg * fix * fix * fix * fix * Revert "settings.json" This reverts commit 7000c88.
* researchmap first commit
# Conflicts: # modules/weko-admin/weko_admin/admin.py # modules/weko-admin/weko_admin/templates/weko_admin/admin/cris_linkage_setting.html # modules/weko-admin/weko_admin/translations/ja/LC_MESSAGES/messages.mo # modules/weko-admin/weko_admin/translations/ja/LC_MESSAGES/messages.po # modules/weko-items-autofill/weko_items_autofill/config.py # modules/weko-items-autofill/weko_items_autofill/utils.py # modules/weko-items-ui/weko_items_ui/config.py # modules/weko-items-ui/weko_items_ui/tasks.py # scripts/instance.cfg Signed-off-by: iviskazukiakashi <115054422+iviskazukiakashi@users.noreply.github.com>
Feature/ticket 40138
Feature/ticket 40138
Update jsonld and swordsettings columns.
…_shibboleth_setting_message fix save message and updating roles
fix test fd, models, permissions, rest
…nslations fix shib settings translations
Update query tests
…_skip_condition fix skip condition and group info db setting
…rchmap Feature/w2024 58b researchmap
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
10 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.
記録は以下に記述
https://redmine.devops.rcos.nii.ac.jp/issues/53808