Skip to content

Actions: 4Science/DSpace

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label_merge_conflicts.yml
568 workflow runs
568 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merged in task/dspace-cris-2023_02_x/DSC-1897 (pull request #2663) Check for merge conflicts #1233: Commit 731e0d9 pushed by 4science-it
December 13, 2024 14:04 3s dspace-cris-2023_02_x
dspace-cris-2023_02_x
December 13, 2024 14:04 3s
Merged in task/dspace-cris-2023_02_x/DSC-1899 (pull request #3184) Check for merge conflicts #1232: Commit d05f884 pushed by 4science-it
December 13, 2024 13:49 1s dspace-cris-2023_02_x
dspace-cris-2023_02_x
December 13, 2024 13:49 1s
Merge pull request #10080 from tdonohue/support_other_docker_repos Check for merge conflicts #1231: Commit 4bc9e72 pushed by 4science-it
December 12, 2024 21:31 3s main
main
December 12, 2024 21:31 3s
Merge pull request #9318 from leuphana/issue-9317 Check for merge conflicts #1230: Commit be92570 pushed by 4science-it
December 10, 2024 16:51 2s main
main
December 10, 2024 16:51 2s
Ensure we use the main Docker image, and not the "-test" image. Check for merge conflicts #1229: Commit 5d324b1 pushed by 4science-it
December 9, 2024 18:11 3s main
main
December 9, 2024 18:11 3s
Merge pull request #10085 from tdonohue/cache_docker_builds Check for merge conflicts #1228: Commit 1800d16 pushed by 4science-it
December 9, 2024 16:01 4s main
main
December 9, 2024 16:01 4s
Merged in task/dspace-cris-2023_02_x/ORC-20 (pull request #3115) Check for merge conflicts #1227: Commit f014452 pushed by 4science-it
December 6, 2024 11:39 2s dspace-cris-2023_02_x
dspace-cris-2023_02_x
December 6, 2024 11:39 2s
Merge pull request #9728 from atmire/w2p-116609_improve-running-proce… Check for merge conflicts #1226: Commit 1b16a55 pushed by 4science-it
December 5, 2024 21:11 3s main
main
December 5, 2024 21:11 3s
Merge pull request #10081 from tdonohue/fix_docker_build Check for merge conflicts #1225: Commit 16427a5 pushed by 4science-it
December 5, 2024 18:21 3s main
main
December 5, 2024 18:21 3s
Merge pull request #10079 from tdonohue/use_local_images_for_deploy Check for merge conflicts #1224: Commit 560dae4 pushed by 4science-it
December 5, 2024 17:21 3s main
main
December 5, 2024 17:21 3s
Merge pull request #10072 from saschaszott/saschaszott-patch-4 Check for merge conflicts #1223: Commit 72d36a3 pushed by 4science-it
December 4, 2024 17:31 3s main
main
December 4, 2024 17:31 3s
Merge pull request #10070 from tdonohue/fixup_docker_builds Check for merge conflicts #1222: Commit b88b237 pushed by 4science-it
December 3, 2024 23:11 3s main
main
December 3, 2024 23:11 3s
Merge pull request #10064 from DSpace/dependabot/maven/apache-commons… Check for merge conflicts #1221: Commit 7542889 pushed by 4science-it
December 3, 2024 17:11 5s main
main
December 3, 2024 17:11 5s
Merge pull request #10065 from DSpace/dependabot/maven/fasterxml-4a19… Check for merge conflicts #1220: Commit 3d1de02 pushed by 4science-it
December 3, 2024 17:01 4s main
main
December 3, 2024 17:01 4s
Merge pull request #10049 from DSpace/dependabot/maven/com.amazonaws-… Check for merge conflicts #1219: Commit 5e847a8 pushed by 4science-it
December 3, 2024 15:41 3s main
main
December 3, 2024 15:41 3s
Merge pull request #9658 from atmire/feature-curation-link-checker-cu… Check for merge conflicts #1218: Commit 9fdf49a pushed by 4science-it
December 3, 2024 15:21 2s main
main
December 3, 2024 15:21 2s
Merge pull request #10048 from DSpace/dependabot/maven/log4j.version-… Check for merge conflicts #1217: Commit 8066fe6 pushed by 4science-it
December 2, 2024 23:21 3s main
main
December 2, 2024 23:21 3s
Merge pull request #9941 from alexandrevryghem/w2p-119960_fixed-UUIDL… Check for merge conflicts #1216: Commit 60ff46c pushed by 4science-it
December 2, 2024 16:11 3s main
main
December 2, 2024 16:11 3s
Merge pull request #10043 from dsteelma-umd/add-dspace-server-module-… Check for merge conflicts #1215: Commit 72c7adf pushed by 4science-it
December 2, 2024 15:51 2s main
main
December 2, 2024 15:51 2s
Merge pull request #10051 from saschaszott/saschaszott-patch-3 Check for merge conflicts #1214: Commit c90e993 pushed by 4science-it
December 2, 2024 15:11 2s main
main
December 2, 2024 15:11 2s
Fix syntax error in #10040. Env variables cannot have dashes or periods Check for merge conflicts #1213: Commit fc544a8 pushed by 4science-it
November 22, 2024 20:01 2s main
main
November 22, 2024 20:01 2s
Merge pull request #10040 from tdonohue/docker_enable_all_controllers Check for merge conflicts #1212: Commit f5a207d pushed by 4science-it
November 22, 2024 19:31 3s main
main
November 22, 2024 19:31 3s
Merge pull request #10036 from tdonohue/log4j_slf4j_cleanup Check for merge conflicts #1211: Commit 1ce1cf1 pushed by 4science-it
November 22, 2024 16:51 3s main
main
November 22, 2024 16:51 3s
Merge pull request #10032 from tdonohue/minor_dep_cleanup Check for merge conflicts #1210: Commit 40fbd80 pushed by 4science-it
November 21, 2024 05:01 2s main
main
November 21, 2024 05:01 2s
Merge pull request #10023 from DSpace/dependabot/maven/com.amazonaws-… Check for merge conflicts #1209: Commit 77d7401 pushed by 4science-it
November 20, 2024 20:41 3s main
main
November 20, 2024 20:41 3s