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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #10408 from DSpace/backport-10406-to-main Check for merge conflicts #1307: Commit 19aa8bc pushed by 4science-it
February 13, 2025 19:01 4s main
main
February 13, 2025 19:01 4s
Merge pull request #10386 from DSpace/dependabot/maven/tika.version-2… Check for merge conflicts #1306: Commit 0417beb pushed by 4science-it
February 12, 2025 23:21 3s main
main
February 12, 2025 23:21 3s
Merge pull request #10128 from atmire/w2p-121971_openaire-compliance-… Check for merge conflicts #1305: Commit 1883593 pushed by 4science-it
February 12, 2025 18:41 2s main
main
February 12, 2025 18:41 2s
Fixing Crossref document type issue with new metadata mapping process… Check for merge conflicts #1304: Commit f3e378d pushed by 4science-it
February 12, 2025 13:22 2s main
main
February 12, 2025 13:22 2s
Merge pull request #10385 from DSpace/dependabot/maven/apache-commons… Check for merge conflicts #1303: Commit 962e2af pushed by 4science-it
February 11, 2025 16:51 3s main
main
February 11, 2025 16:51 3s
Merge pull request #10384 from DSpace/dependabot/maven/build-tools-2e… Check for merge conflicts #1302: Commit ad4a3b7 pushed by 4science-it
February 11, 2025 16:01 3s main
main
February 11, 2025 16:01 3s
Merge pull request #10367 from DSpace/dependabot/maven/org.apache.htt… Check for merge conflicts #1301: Commit 34d223e pushed by 4science-it
February 10, 2025 20:31 2s main
main
February 10, 2025 20:31 2s
Merge pull request #10368 from DSpace/dependabot/maven/com.google.cod… Check for merge conflicts #1300: Commit 4ab117c pushed by 4science-it
February 10, 2025 20:21 3s main
main
February 10, 2025 20:21 3s
Merge pull request #10381 from tdonohue/remove_unused_deps Check for merge conflicts #1299: Commit 3a7bfba pushed by 4science-it
February 10, 2025 17:31 3s main
main
February 10, 2025 17:31 3s
Merge pull request #10370 from DSpace/dependabot/maven/org.checkerfra… Check for merge conflicts #1298: Commit 3c70f1e pushed by 4science-it
February 10, 2025 15:51 4s main
main
February 10, 2025 15:51 4s
Merged in task/dspace-cris-2023_02_x/DSC-1788 (pull request #2376) Check for merge conflicts #1297: Commit 15b2c48 pushed by 4science-it
February 10, 2025 08:44 2s dspace-cris-2023_02_x
dspace-cris-2023_02_x
February 10, 2025 08:44 2s
Merge tag 'dspace-8.1' Check for merge conflicts #1296: Commit a4ba1c3 pushed by 4science-it
February 7, 2025 20:01 2s main
main
February 7, 2025 20:01 2s
Merged in task/dspace-cris-2023_02_x/DSC-2136 (pull request #3276) Check for merge conflicts #1295: Commit 15219ae pushed by 4science-it
February 7, 2025 14:44 2s dspace-cris-2023_02_x
dspace-cris-2023_02_x
February 7, 2025 14:44 2s
Merge pull request #9856 from 4Science/task/main/DURACOM-288 Check for merge conflicts #1294: Commit f4bac37 pushed by 4science-it
February 6, 2025 16:11 2s main
main
February 6, 2025 16:11 2s
Fix ClamAV curation task crashing on exceptions instead of ending gra… Check for merge conflicts #1293: Commit 7976c37 pushed by 4science-it
February 1, 2025 10:01 2s main
main
February 1, 2025 10:01 2s
Merge pull request #10350 from DSpace/backport-10117-to-main Check for merge conflicts #1292: Commit 7581089 pushed by 4science-it
January 29, 2025 18:11 3s main
main
January 29, 2025 18:11 3s
Merge pull request #10031 from saschaszott/patch-53 Check for merge conflicts #1291: Commit d95c8fe pushed by 4science-it
January 29, 2025 16:01 3s main
main
January 29, 2025 16:01 3s
Merged in task/dspace-cris-2023_02_x/DSC-1263 (pull request #3385) Check for merge conflicts #1290: Commit 8e21169 pushed by 4science-it
January 28, 2025 15:29 2s dspace-cris-2023_02_x
dspace-cris-2023_02_x
January 28, 2025 15:29 2s
Merge pull request #10341 from DSpace/dependabot/maven/build-tools-14… Check for merge conflicts #1289: Commit ca7851f pushed by 4science-it
January 28, 2025 15:22 2s main
main
January 28, 2025 15:22 2s
Merge pull request #10331 from tdonohue/unused_config Check for merge conflicts #1288: Commit 37ae603 pushed by 4science-it
January 27, 2025 16:11 3s main
main
January 27, 2025 16:11 3s
Merge pull request #9835 from mwoodiupui/doi-organiser-commit Check for merge conflicts #1287: Commit 2f4228f pushed by 4science-it
January 27, 2025 15:51 3s main
main
January 27, 2025 15:51 3s
added expunge request param and enabled workflowitem delete based on … Check for merge conflicts #1286: Commit c5e6d55 pushed by 4science-it
January 24, 2025 16:11 3s main
main
January 24, 2025 16:11 3s
Merge pull request #10304 from DSpace/dependabot/maven/spring-cb787a786d Check for merge conflicts #1285: Commit e405f1f pushed by 4science-it
January 23, 2025 23:01 2s main
main
January 23, 2025 23:01 2s
Merge pull request #10158 from atmire/w2p-116609_improve-running-proc… Check for merge conflicts #1284: Commit daca1b1 pushed by 4science-it
January 23, 2025 22:21 3s main
main
January 23, 2025 22:21 3s
Merge pull request #10299 from tdonohue/remove_google_apis Check for merge conflicts #1283: Commit 14b808e pushed by 4science-it
January 23, 2025 18:31 2s main
main
January 23, 2025 18:31 2s