Skip to content

Actions: microsoft/azurelinux

Actions

Github Merge Conflict Check

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
merge-conflict-check.yml
2,551 workflow runs
2,551 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fixing generate_source_tarball.sh for helm to match other scripts Github Merge Conflict Check #3039: Pull request #12143 synchronize by mbykhovtsev-ms
January 30, 2025 01:28 29s mbykhovtsev/helm-generate-script
mbykhovtsev/helm-generate-script
January 30, 2025 01:28 29s
Fixing generate_source_tarball.sh for influxdb and influx-cli to match other scripts Github Merge Conflict Check #3038: Pull request #12142 synchronize by mbykhovtsev-ms
January 30, 2025 01:27 35s mbykhovtsev/influx-vendor-script
mbykhovtsev/influx-vendor-script
January 30, 2025 01:27 35s
tensorflow: Fix CVE-2024-5569 and CVE-2024-6923 Github Merge Conflict Check #3037: Pull request #12018 synchronize by KavyaSree2610
January 30, 2025 01:21 33s KavyaSree2610:kkaitepalli/tensorflow-CVEs
KavyaSree2610:kkaitepalli/tensorflow-CVEs
January 30, 2025 01:21 33s
Fixing generate_source_tarball.sh for helm to match other scripts Github Merge Conflict Check #3036: Pull request #12143 opened by mbykhovtsev-ms
January 30, 2025 00:53 34s mbykhovtsev/helm-generate-script
mbykhovtsev/helm-generate-script
January 30, 2025 00:53 34s
python-pysocks: remove package from extended (#12121) Github Merge Conflict Check #3035: Commit e7cc218 pushed by anphel31
January 30, 2025 00:48 31s 3.0-dev
3.0-dev
January 30, 2025 00:48 31s
Fixing generate_source_tarball.sh for influxdb and influx-cli to match other scripts Github Merge Conflict Check #3034: Pull request #12142 synchronize by mbykhovtsev-ms
January 30, 2025 00:38 33s mbykhovtsev/influx-vendor-script
mbykhovtsev/influx-vendor-script
January 30, 2025 00:38 33s
Fixing generate_source_tarball.sh for influxdb and influx-cli to match other scripts Github Merge Conflict Check #3033: Pull request #12142 opened by mbykhovtsev-ms
January 30, 2025 00:37 33s mbykhovtsev/influx-vendor-script
mbykhovtsev/influx-vendor-script
January 30, 2025 00:37 33s
Upgrade golang/x/net for CVE-2023-39325 and CVE-2023-44487 Github Merge Conflict Check #3032: Pull request #12125 synchronize by gjswalling
January 30, 2025 00:02 31s gaswal/app-gw-cve
gaswal/app-gw-cve
January 30, 2025 00:02 31s
[AUTOPATCHER-kernel] Kernel CVE - branch 3.0-dev - CVE-2024-43835 CVE-2024-44963 CVE-2024-49926 CVE-2024-42252 CVE-2024-40965 CVE-2024-41071 CVE-2024-44955 CVE-2024-36910 CVE-2024-42122 CVE-2024-50027 CVE-2024-49915 CVE-2024-49891 CVE-2024-27011 CVE-2024-49934 CVE-2024-43911 CVE-2024-49906 CVE-2024-42156 CVE-2024-49974 CVE-2024-49899 CVE-2024-49914 CVE-2024-49909 CVE-2024-50067 CVE-2024-49917 CVE-2024-44950 CVE-2024-49898 CVE-2023-52920 CVE-2024-53085 CVE-2024-46841 CVE-2024-50010 CVE-2024-49911 CVE-2024-36972 CVE-2024-43857 CVE-2024-41080 CVE-2024-43904 CVE-2024-49897 CVE-2024-43913 Github Merge Conflict Check #3031: Pull request #12141 opened by CBL-Mariner-Bot
January 29, 2025 23:36 38s cblmargh/kernel-CVE-3.0-dev
cblmargh/kernel-CVE-3.0-dev
January 29, 2025 23:36 38s
[Medium] Patch ceph to fix CVE-2014-5461 Github Merge Conflict Check #3030: Pull request #12123 synchronize by kevin-b-lockwood
January 29, 2025 23:11 35s kevin-b-lockwood:kevin-b-lockwood/ceph-CVE-2014-5461
kevin-b-lockwood:kevin-b-lockwood/ceph-CVE-2014-5461
January 29, 2025 23:11 35s
[Medium] Patch ceph to fix CVE-2020-22217 Github Merge Conflict Check #3029: Pull request #12105 synchronize by kevin-b-lockwood
January 29, 2025 22:23 35s kevin-b-lockwood:kevin-b-lockwood/ceph-CVE-2020-22217
kevin-b-lockwood:kevin-b-lockwood/ceph-CVE-2020-22217
January 29, 2025 22:23 35s
[Medium] Patch ceph to fix CVE-2015-9251 Github Merge Conflict Check #3028: Pull request #12140 opened by kevin-b-lockwood
January 29, 2025 22:16 39s kevin-b-lockwood:kevin-b-lockwood/ceph-CVE-2015-9251
kevin-b-lockwood:kevin-b-lockwood/ceph-CVE-2015-9251
January 29, 2025 22:16 39s
Merge branch '3.0-dev' into 3.0 Github Merge Conflict Check #3027: Commit 91b9b45 pushed by jslobodzian
January 29, 2025 21:41 36s 3.0
3.0
January 29, 2025 21:41 36s
Adding generate_source_tarball.sh to git-lfs Github Merge Conflict Check #3026: Pull request #12139 synchronize by osamaesmailmsft
January 29, 2025 21:40 40s osamaesmail/vendor_git-lfs
osamaesmail/vendor_git-lfs
January 29, 2025 21:40 40s
Bphilip/rename mlnx ofa kernel (#12138) Github Merge Conflict Check #3025: Commit 32428ae pushed by jslobodzian
January 29, 2025 21:01 32s 3.0-dev
3.0-dev
January 29, 2025 21:01 32s
User/jocelynb/add fwupd spec Github Merge Conflict Check #3024: Pull request #11971 synchronize by JocelynBerrendonner
January 29, 2025 20:49 30s JocelynBerrendonner:user/jocelynb/add_fwupd_spec
JocelynBerrendonner:user/jocelynb/add_fwupd_spec
January 29, 2025 20:49 30s
Bphilip/rename mlnx ofa kernel Github Merge Conflict Check #3023: Pull request #12138 opened by binujp
January 29, 2025 20:40 31s bphilip/rename-mlnx-ofa-kernel
bphilip/rename-mlnx-ofa-kernel
January 29, 2025 20:40 31s
User/jocelynb/add fwupd spec Github Merge Conflict Check #3022: Pull request #11971 synchronize by JocelynBerrendonner
January 29, 2025 20:39 36s JocelynBerrendonner:user/jocelynb/add_fwupd_spec
JocelynBerrendonner:user/jocelynb/add_fwupd_spec
January 29, 2025 20:39 36s
User/jocelynb/add fwupd spec Github Merge Conflict Check #3021: Pull request #11971 synchronize by JocelynBerrendonner
January 29, 2025 20:33 42s JocelynBerrendonner:user/jocelynb/add_fwupd_spec
JocelynBerrendonner:user/jocelynb/add_fwupd_spec
January 29, 2025 20:33 42s
[AUTO-CHERRYPICK] Patch containerized-data-importer for CVE-2024-2818… Github Merge Conflict Check #3020: Commit dfce688 pushed by jslobodzian
January 29, 2025 20:31 31s 3.0-dev
3.0-dev
January 29, 2025 20:31 31s
[AUTO-CHERRYPICK] Fix multiple CVE in Skopeo - branch 3.0-dev (#12134) Github Merge Conflict Check #3019: Commit 5a82cf5 pushed by jslobodzian
January 29, 2025 20:31 39s 3.0-dev
3.0-dev
January 29, 2025 20:31 39s
[AUTO-CHERRYPICK] Patch rook for CVE-2024-28180 - branch main (#12133) Github Merge Conflict Check #3018: Commit 63f3442 pushed by jslobodzian
January 29, 2025 20:31 42s main
main
January 29, 2025 20:31 42s
[AUTO-CHERRYPICK] [Medium] patch openmpi to fix CVE-2022-47022 - bran… Github Merge Conflict Check #3017: Commit 1a1c51b pushed by jslobodzian
January 29, 2025 20:30 30s main
main
January 29, 2025 20:30 30s
[AUTO-CHERRYPICK] [Medium] cmake: Fix CVE-2024-7264 and CVE-2024-9681… Github Merge Conflict Check #3016: Commit f426b7a pushed by jslobodzian
January 29, 2025 20:30 34s 3.0-dev
3.0-dev
January 29, 2025 20:30 34s
[AUTO-CHERRYPICK] Patch nodejs for CVE-2025-23083 - branch 3.0-dev (#… Github Merge Conflict Check #3015: Commit 16cb2ad pushed by jslobodzian
January 29, 2025 20:30 39s 3.0-dev
3.0-dev
January 29, 2025 20:30 39s