Skip to content

Actions: DIMSI-IS/cloudstack

Actions

PR Merge Conflict Check

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
merge-conflict-checker.yml
41 workflow runs
41 workflow runs

Filter by Event

⌥ + click/return to exclude

Filter by Status

⌥ + click/return to exclude

Filter by Branch

⌥ + click/return to exclude

Filter by Actor

⌥ + click/return to exclude
Compiles PR Merge Conflict Check #115: Commit 34a4931 pushed by m-dhellin
11s Backroll-dev
Backroll-dev
11s
Merge branch 'new-auth' into Backroll-dev PR Merge Conflict Check #114: Commit bf3565a pushed by m-dhellin
7s Backroll-dev
Backroll-dev
7s
Updated BackrollClient PR Merge Conflict Check #113: Commit aa21a5f pushed by m-dhellin
6s Backroll-dev
Backroll-dev
6s
Trying to compile PR Merge Conflict Check #112: Commit f4e6e81 pushed by m-dhellin
8s Backroll-dev
Backroll-dev
8s
Merge branch 'Backroll' into Backroll-dev PR Merge Conflict Check #111: Commit f50602c pushed by m-dhellin
7s Backroll-dev
Backroll-dev
7s
Merge branch 'main' into Backroll PR Merge Conflict Check #110: Commit 10b2a77 pushed by m-dhellin
7s Backroll
Backroll
7s
Testing auth with GET PR Merge Conflict Check #109: Commit e8004db pushed by m-dhellin
6s Backroll-dev
Backroll-dev
6s
BackrollHttpClient PR Merge Conflict Check #108: Commit 4f20e28 pushed by m-dhellin
13s Backroll-dev
Backroll-dev
13s
Merge branch 'main' into Backroll-dev PR Merge Conflict Check #107: Commit 4bf0beb pushed by m-dhellin
9s Backroll-dev
Backroll-dev
9s
Update plugins/backup/backroll/pom.xml PR Merge Conflict Check #106: Commit d099788 pushed by m-dhellin
10s Backroll
Backroll
10s
Updated consumeResponse(…) PR Merge Conflict Check #105: Commit 57cdb99 pushed by m-dhellin
7s new-auth
new-auth
7s
Removed trailing spaces. PR Merge Conflict Check #104: Commit 8edfa30 pushed by m-dhellin
8s new-auth
new-auth
8s
Merge branch 'main' into new-auth PR Merge Conflict Check #103: Commit 97b440a pushed by m-dhellin
7s new-auth
new-auth
7s
Merge branch '4.22' PR Merge Conflict Check #102: Commit 30e6c22 pushed by m-dhellin
8s main
main
8s
Removed trailing spaces. PR Merge Conflict Check #101: Commit 8edfa30 pushed by m-dhellin
6s new-auth
new-auth
6s
Formatted some files. PR Merge Conflict Check #100: Commit 49cdf55 pushed by m-dhellin
6s new-auth
new-auth
6s
Fixed NPE in login(…) PR Merge Conflict Check #99: Commit d02a9c2 pushed by m-dhellin
8s new-auth
new-auth
8s
Updated isAuthenticated(…) PR Merge Conflict Check #98: Commit c2725f6 pushed by m-dhellin
12s new-auth
new-auth
12s
Be aware of ownership when logging : stream can be consumed only once PR Merge Conflict Check #97: Commit 4f5dc04 pushed by m-dhellin
6s new-auth
new-auth
6s
Reversed no backup offering condition PR Merge Conflict Check #96: Commit 4ca49e2 pushed by m-dhellin
6s new-auth
new-auth
6s
Fixed test route using get PR Merge Conflict Check #95: Commit 512868b pushed by m-dhellin
10s new-auth
new-auth
10s
Merge remote-tracking branch 'origin/main' into new-auth PR Merge Conflict Check #94: Commit 8c37391 pushed by m-dhellin
11s new-auth
new-auth
11s
[CI] Dependabot: add a cooldown period for new releases (#12384) PR Merge Conflict Check #93: Commit e47d7bc pushed by m-dhellin
7s main
main
7s
new auth PR Merge Conflict Check #92: Commit 7fac469 pushed by m-dhellin
9s new-auth
new-auth
9s
Upgrade of backroll PR Merge Conflict Check #91: Commit 8952215 pushed by cgoconseils
6s backroll-4.23
backroll-4.23
6s