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
456 workflow runs
456 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge tag 'dspace-7.6.5' Check for merge conflicts #1504: Commit 0bd67df pushed by 4science-it
July 22, 2025 21:11 1s main
main
July 22, 2025 21:11 1s
Merge branch 'dspace-cris-2023.02.07.01_new_release' into dspace-cris… Check for merge conflicts #1503: Commit 0ea5024 pushed by 4science-it
July 22, 2025 16:09 1s dspace-cris-2023_02_x
dspace-cris-2023_02_x
July 22, 2025 16:09 1s
Prepare addon version for the next development iteration Check for merge conflicts #1502: Commit 23812bb pushed by vins01-4science
July 22, 2025 14:51 1s dspace-cris-2023.02.07.01_new_release
dspace-cris-2023.02.07.01_new_release
July 22, 2025 14:51 1s
[maven-release-plugin] prepare for next development iteration Check for merge conflicts #1501: Commit 3386164 pushed by vins01-4science
July 22, 2025 14:49 2s dspace-cris-2023.02.07.01_new_release
dspace-cris-2023.02.07.01_new_release
July 22, 2025 14:49 2s
[maven-release-plugin] prepare release dspace-cris-2023.02.07.01 Check for merge conflicts #1500: Commit 1691930 pushed by vins01-4science
July 22, 2025 14:36 1s dspace-cris-2023.02.07.01_new_release
dspace-cris-2023.02.07.01_new_release
July 22, 2025 14:36 1s
Merge pull request #11025 from DSpace/dependabot/maven/log4j.version-… Check for merge conflicts #1499: Commit 867b6eb pushed by 4science-it
July 22, 2025 14:32 2s main
main
July 22, 2025 14:32 2s
[DSC-2449] Fixes ITs failure and upgrades xoai.version Check for merge conflicts #1498: Commit 1acfde3 pushed by vins01-4science
July 22, 2025 11:37 2s dspace-cris-2023.02.07.01_new_release
dspace-cris-2023.02.07.01_new_release
July 22, 2025 11:37 2s
Merged in task/dspace-cris-2024_02_x/DSC-2435 (pull request #4240) Check for merge conflicts #1497: Commit 9d6b962 pushed by 4science-it
July 22, 2025 10:52 1s dspace-cris-2024_02_x
dspace-cris-2024_02_x
July 22, 2025 10:52 1s
Merge pull request #11063 from tdonohue/fix_tests_on_windows Check for merge conflicts #1496: Commit 46e8061 pushed by 4science-it
July 22, 2025 09:32 1s main
main
July 22, 2025 09:32 1s
[DSC-2449] Fixes ITs failure and upgrades xoai.version Check for merge conflicts #1495: Commit 56a1f6f pushed by vins01-4science
July 21, 2025 14:13 1s dspace-cris-2023.02.07.01_release
dspace-cris-2023.02.07.01_release
July 21, 2025 14:13 1s
Merge pull request #9842 from kshepherd/auth-value-service_remove_con… Check for merge conflicts #1494: Commit 144c36d pushed by 4science-it
July 18, 2025 13:51 1s main
main
July 18, 2025 13:51 1s
[maven-release-plugin] Fix prepare release dspace-cris-2023.02.07 Check for merge conflicts #1493: Commit 8fecfce pushed by atarix83
July 17, 2025 15:38 1s dspace-cris-2023.02.07.01_branch
dspace-cris-2023.02.07.01_branch
July 17, 2025 15:38 1s
[maven-release-plugin] prepare for next development iteration Check for merge conflicts #1492: Commit 1d1109f pushed by atarix83
July 16, 2025 18:15 1s dspace-cris-2023.02.07.01_release
dspace-cris-2023.02.07.01_release
July 16, 2025 18:15 1s
[maven-release-plugin] prepare release dspace-cris-2023.02.07.01 Check for merge conflicts #1491: Commit 9cfea5a pushed by atarix83
July 16, 2025 18:15 2s dspace-cris-2023.02.07.01_release
dspace-cris-2023.02.07.01_release
July 16, 2025 18:15 2s
Merged in task/dspace-cris-2023_02_x/DSC-2277 (pull request #4070) Check for merge conflicts #1490: Commit 5ea4fe4 pushed by 4science-it
July 16, 2025 16:49 1s dspace-cris-2023_02_x
dspace-cris-2023_02_x
July 16, 2025 16:49 1s
Merged in task/dspace-cris-2024_02_x/DSC-2277 (pull request #4071) Check for merge conflicts #1489: Commit bd34530 pushed by 4science-it
July 16, 2025 15:41 1s dspace-cris-2024_02_x
dspace-cris-2024_02_x
July 16, 2025 15:41 1s
Merge tag 'dspace-9.1' Check for merge conflicts #1488: Commit a56c5ce pushed by 4science-it
July 14, 2025 21:51 7s main
main
July 14, 2025 21:51 7s
Merge pull request #11031 from kshepherd/saf-lfi-fix-3 Check for merge conflicts #1487: Commit 631869a pushed by 4science-it
July 14, 2025 14:41 Skipped main
main
July 14, 2025 14:41 Skipped
Merge pull request #11030 from kshepherd/saf-xml-fix-2 Check for merge conflicts #1486: Commit d7b04bb pushed by 4science-it
July 14, 2025 14:32 1s main
main
July 14, 2025 14:32 1s
Merge pull request #10934 from DSpace/dependabot/maven/spring-971dfeb2c9 Check for merge conflicts #1485: Commit fcaec7a pushed by 4science-it
July 8, 2025 21:52 Skipped main
main
July 8, 2025 21:52 Skipped
Merge pull request #10989 from DSpace/dependabot/maven/org.checkerfra… Check for merge conflicts #1484: Commit c7ca9a9 pushed by 4science-it
July 8, 2025 21:31 2s main
main
July 8, 2025 21:31 2s
Merge pull request #11002 from alanorth/fix-frequency-dates Check for merge conflicts #1483: Commit 115436b pushed by 4science-it
July 8, 2025 19:31 1s main
main
July 8, 2025 19:31 1s
[DSC-1899] Adds build for 2024_02_x Check for merge conflicts #1482: Commit a8ed97f pushed by 4science-it
July 8, 2025 15:26 1s dspace-cris-2024_02_x
dspace-cris-2024_02_x
July 8, 2025 15:26 1s
Merged in task/dspace-cris-2024_02_x/DSC-2414 (pull request #4181) Check for merge conflicts #1481: Commit 918ba1e pushed by 4science-it
July 3, 2025 07:56 1s dspace-cris-2024_02_x
dspace-cris-2024_02_x
July 3, 2025 07:56 1s
Merged in task/dspace-cris-2023_02_x/DSC-2414 (pull request #4180) Check for merge conflicts #1480: Commit 7a44288 pushed by 4science-it
July 3, 2025 07:55 1s dspace-cris-2023_02_x
dspace-cris-2023_02_x
July 3, 2025 07:55 1s