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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Update pull_request_template.md Check for merge conflicts #1086: Commit 87e7c98 pushed by 4science-it
July 11, 2024 20:01 3s main
main
July 11, 2024 20:01 3s
Prepare addon version for the next development iteration Check for merge conflicts #1085: Commit caea122 pushed by 4science-it
July 11, 2024 11:28 1s dspace-cris-2023_02_x
dspace-cris-2023_02_x
July 11, 2024 11:28 1s
[maven-release-plugin] prepare for next development iteration Check for merge conflicts #1084: Commit 825d254 pushed by atarix83
July 11, 2024 11:17 2s dspace-cris-2023_02_x
dspace-cris-2023_02_x
July 11, 2024 11:17 2s
[maven-release-plugin] prepare release dspace-cris-2023.02.05 Check for merge conflicts #1083: Commit a065852 pushed by atarix83
July 11, 2024 11:17 2s dspace-cris-2023_02_x
dspace-cris-2023_02_x
July 11, 2024 11:17 2s
Merge pull request #9691 from tdonohue/fix_signposting_test Check for merge conflicts #1082: Commit c897b1f pushed by 4science-it
July 10, 2024 20:20 3s main
main
July 10, 2024 20:20 3s
Merge pull request #9682 from TexasDigitalLibrary/DS-9323-fix-cc-lice… Check for merge conflicts #1081: Commit 83857ae pushed by 4science-it
July 9, 2024 20:50 2s main
main
July 9, 2024 20:50 2s
Merge tag 'dspace-7.6.2' Check for merge conflicts #1080: Commit bdd13d0 pushed by 4science-it
July 9, 2024 20:10 2s main
main
July 9, 2024 20:10 2s
Merge pull request #9681 from pilasou/pilasou-DSpace-docker-compose-s… Check for merge conflicts #1079: Commit dd60f37 pushed by 4science-it
July 9, 2024 14:20 3s main
main
July 9, 2024 14:20 3s
Merged in task/dspace-cris-2023_02_x/DSC-1709_CC-license-step-doesn't… Check for merge conflicts #1078: Commit 22b10fd pushed by 4science-it
July 4, 2024 07:53 2s dspace-cris-2023_02_x
dspace-cris-2023_02_x
July 4, 2024 07:53 2s
Update redeployment of demo.dspace.org to use dspace-8_x branch. Check for merge conflicts #1077: Commit fb4093c pushed by 4science-it
July 3, 2024 19:21 3s main
main
July 3, 2024 19:21 3s
Merged in task/dspace-cris-2023_02_x/DSC-1294_alternative (pull reque… Check for merge conflicts #1076: Commit deba0f2 pushed by 4science-it
July 1, 2024 13:28 3s dspace-cris-2023_02_x
dspace-cris-2023_02_x
July 1, 2024 13:28 3s
Merge pull request #9672 from tdonohue/update_contributing Check for merge conflicts #1075: Commit de25105 pushed by 4science-it
June 27, 2024 20:30 1s main
main
June 27, 2024 20:30 1s
Update CONTRIBUTING.md Check for merge conflicts #1074: Commit 303d169 pushed by 4science-it
June 27, 2024 16:20 2s main
main
June 27, 2024 16:20 2s
[maven-release-plugin] prepare for next development iteration Check for merge conflicts #1073: Commit 68c3ba2 pushed by 4science-it
June 26, 2024 19:01 4s main
main
June 26, 2024 19:01 4s
Merged in DSC-1669-aligned (pull request #2352) Check for merge conflicts #1072: Commit 8ede0fb pushed by 4science-it
June 24, 2024 18:28 2s dspace-cris-2023_02_x
dspace-cris-2023_02_x
June 24, 2024 18:28 2s
Merged in task/dspace-cris-2023_02_x/DSC-1757 (pull request #2339) Check for merge conflicts #1071: Commit a32f41f pushed by 4science-it
June 24, 2024 09:18 3s dspace-cris-2023_02_x
dspace-cris-2023_02_x
June 24, 2024 09:18 3s
[maven-release-plugin] prepare for next development iteration Check for merge conflicts #1070: Commit 87f66fb pushed by 4science-it
June 21, 2024 19:31 3s main
main
June 21, 2024 19:31 3s
Update version of dspace-api-lang to use for 8.0 / 8.x releases Check for merge conflicts #1069: Commit debe0a0 pushed by 4science-it
June 21, 2024 15:30 3s main
main
June 21, 2024 15:30 3s
Update LICENSES_THIRD_PARTY (and related configs) for 8.0 release Check for merge conflicts #1068: Commit 4187dba pushed by 4science-it
June 21, 2024 14:40 3s main
main
June 21, 2024 14:40 3s
Merge tag 'dspace-7.6.1' Check for merge conflicts #1067: Commit a4f3b4a pushed by 4science-it
June 20, 2024 19:40 2s main
main
June 20, 2024 19:40 2s
Merge pull request #9655 from tdonohue/bump_latest_spring_boot Check for merge conflicts #1066: Commit 4d1d87c pushed by 4science-it
June 20, 2024 12:11 2s main
main
June 20, 2024 12:11 2s
Merged in task/dspace-cris-2023_02_x/DSC-1698 (pull request #2192) Check for merge conflicts #1065: Commit 43d959e pushed by 4science-it
June 20, 2024 07:14 2s dspace-cris-2023_02_x
dspace-cris-2023_02_x
June 20, 2024 07:14 2s
Merge pull request #9631 from tdonohue/fix_9501 Check for merge conflicts #1064: Commit 075e51d pushed by 4science-it
June 18, 2024 16:11 3s main
main
June 18, 2024 16:11 3s
Merged in task/dspace-cris-2023_02_x/DSC-1777 (pull request #2314) Check for merge conflicts #1063: Commit 0bd85b3 pushed by 4science-it
June 17, 2024 08:18 3s dspace-cris-2023_02_x
dspace-cris-2023_02_x
June 17, 2024 08:18 3s
Merge pull request #9638 from tdonohue/avoid_inline_js Check for merge conflicts #1062: Commit f1059b4 pushed by 4science-it
June 17, 2024 07:31 3s main
main
June 17, 2024 07:31 3s
ProTip! You can narrow down the results and go further in time using created:<2024-06-17 or the other filters available.