Skip to content

Actions: DSpace/dspace-angular

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label_merge_conflicts.yml
2,159 workflow runs
2,159 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #3585 from alexandrevryghem/w2p-117573_remove-obse… Check for merge conflicts #3568: Commit f6d8446 pushed by tdonohue
November 11, 2024 22:18 20s main
main
November 11, 2024 22:18 20s
Merge pull request #3645 from DSpace/backport-3644-to-dspace-8_x Check for merge conflicts #3567: Commit bba9f9c pushed by tdonohue
November 11, 2024 21:15 5m 33s dspace-8_x
dspace-8_x
November 11, 2024 21:15 5m 33s
Merge pull request #3644 from pilasou/pilasou-translations-fr Check for merge conflicts #3566: Commit 3fda97f pushed by tdonohue
November 11, 2024 20:23 27s main
main
November 11, 2024 20:23 27s
French translations for COAR Notify LDN Service Check for merge conflicts #3565: Pull request #3644 synchronize by pilasou
November 11, 2024 19:28 18s
November 11, 2024 19:28 18s
Merge pull request #3643 from DSpace/backport-3222-to-dspace-8_x Check for merge conflicts #3564: Commit a6c2b2c pushed by tdonohue
November 11, 2024 16:40 12s dspace-8_x
dspace-8_x
November 11, 2024 16:40 12s
Merge pull request #3642 from DSpace/backport-3222-to-dspace-7_x Check for merge conflicts #3563: Commit 6330516 pushed by tdonohue
November 11, 2024 16:40 19s dspace-7_x
dspace-7_x
November 11, 2024 16:40 19s
Merge pull request #3222 from dataquest-dev/dtq/update-cs-messages Check for merge conflicts #3562: Commit a097309 pushed by tdonohue
November 11, 2024 15:31 32s main
main
November 11, 2024 15:31 32s
Updated cs messages following the lindat v5 and clarin-dspace v7 instance Check for merge conflicts #3561: Pull request #3222 synchronize by milanmajchrak
November 11, 2024 09:01 17s
November 11, 2024 09:01 17s
Merge pull request #3594 from DSpace/dependabot/npm_and_yarn/dspace-7… Check for merge conflicts #3560: Commit a812e6a pushed by tdonohue
November 8, 2024 22:05 11m 10s dspace-7_x
dspace-7_x
November 8, 2024 22:05 11m 10s
Merge pull request #3598 from DSpace/dependabot/npm_and_yarn/dspace-8… Check for merge conflicts #3559: Commit 100dd46 pushed by tdonohue
November 8, 2024 22:03 7m 25s dspace-8_x
dspace-8_x
November 8, 2024 22:03 7m 25s
Merge pull request #3603 from DSpace/dependabot/npm_and_yarn/sass-832… Check for merge conflicts #3558: Commit 10ccf32 pushed by tdonohue
November 8, 2024 22:03 3m 3s main
main
November 8, 2024 22:03 3m 3s
Merge pull request #3627 from tdonohue/port_3328_to_7x Check for merge conflicts #3557: Commit 841caec pushed by tdonohue
November 8, 2024 22:01 16s dspace-7_x
dspace-7_x
November 8, 2024 22:01 16s
Merge pull request #3626 from DSpace/backport-3625-to-dspace-7_x Check for merge conflicts #3556: Commit 9715eab pushed by tdonohue
November 8, 2024 22:01 18s dspace-7_x
dspace-7_x
November 8, 2024 22:01 18s
Bump core-js from 3.38.1 to 3.39.0 Check for merge conflicts #3555: Pull request #3597 synchronize by dependabot bot
November 8, 2024 20:35 56m 46s
November 8, 2024 20:35 56m 46s
Bump core-js from 3.38.1 to 3.39.0 Check for merge conflicts #3554: Pull request #3602 synchronize by dependabot bot
November 8, 2024 20:34 47m 41s
November 8, 2024 20:34 47m 41s
Merge pull request #3595 from DSpace/dependabot/npm_and_yarn/dspace-7… Check for merge conflicts #3553: Commit 25fd1a9 pushed by tdonohue
November 8, 2024 20:33 41m 52s dspace-7_x
dspace-7_x
November 8, 2024 20:33 41m 52s
Bump core-js from 3.38.1 to 3.39.0 Check for merge conflicts #3552: Pull request #3607 synchronize by dependabot bot
November 8, 2024 20:33 36m 10s
November 8, 2024 20:33 36m 10s
Merge pull request #3600 from DSpace/dependabot/npm_and_yarn/dspace-8… Check for merge conflicts #3551: Commit 783ff99 pushed by tdonohue
November 8, 2024 20:32 31m 40s dspace-8_x
dspace-8_x
November 8, 2024 20:32 31m 40s
Merge pull request #3606 from DSpace/dependabot/npm_and_yarn/compress… Check for merge conflicts #3550: Commit 0f850f3 pushed by tdonohue
November 8, 2024 20:31 22m 0s main
main
November 8, 2024 20:31 22m 0s
Bump sass from 1.80.4 to 1.80.6 in the sass group Check for merge conflicts #3549: Pull request #3598 synchronize by dependabot bot
November 8, 2024 20:30 18m 2s
November 8, 2024 20:30 18m 2s
Bump sass from 1.80.4 to 1.80.6 in the sass group Check for merge conflicts #3548: Pull request #3603 synchronize by dependabot bot
November 8, 2024 20:29 10m 47s
November 8, 2024 20:29 10m 47s
Merge pull request #3599 from DSpace/dependabot/npm_and_yarn/dspace-8… Check for merge conflicts #3547: Commit 3e478a4 pushed by tdonohue
November 8, 2024 20:28 6m 45s dspace-8_x
dspace-8_x
November 8, 2024 20:28 6m 45s
Merge pull request #3604 from DSpace/dependabot/npm_and_yarn/webpack-… Check for merge conflicts #3546: Commit 89e458a pushed by tdonohue
November 8, 2024 20:27 3m 20s main
main
November 8, 2024 20:27 3m 20s
Merge pull request #3328 from Andrea-Guevara/AccessibilityCookieSettings Check for merge conflicts #3545: Commit 65a4099 pushed by tdonohue
November 8, 2024 20:18 22s dspace-8_x
dspace-8_x
November 8, 2024 20:18 22s
Merge pull request #3625 from tdonohue/fix_klaro_translations_8x Check for merge conflicts #3544: Commit 9add368 pushed by tdonohue
November 8, 2024 20:13 20s dspace-8_x
dspace-8_x
November 8, 2024 20:13 20s