Skip to content

[AUTOPATCHER-kernel] Kernel CVE - branch main - CVE-2024-43834 CVE-2024-47670 CVE-2021-47482 CVE-2024-46852 CVE-2024-38545 CVE-2024-47671 CVE-2024-50058 CVE-2022-48635 CVE-2024-46859 CVE-2024-46854 CVE-2024-36893 CVE-2024-26875 CVE-2024-43839 CVE-2024-50072 CVE-2024-38538 CVE-2024-41080 CVE-2024-50036 CVE-2024-43849 CVE-2024-47673 CVE-2024-43835 CVE-2023-52913 CVE-2024-46849 CVE-2024-44931 CVE-2024-50086 CVE-2024-36972 CVE-2024-50010 CVE-2024-47672 CVE-2024-46853 CVE-2023-52601 CVE-2024-46695 CVE-2024-46855 CVE-2024-43841 CVE-2024-43846 CVE-2024-39463 CVE-2024-46858 #1340

[AUTOPATCHER-kernel] Kernel CVE - branch main - CVE-2024-43834 CVE-2024-47670 CVE-2021-47482 CVE-2024-46852 CVE-2024-38545 CVE-2024-47671 CVE-2024-50058 CVE-2022-48635 CVE-2024-46859 CVE-2024-46854 CVE-2024-36893 CVE-2024-26875 CVE-2024-43839 CVE-2024-50072 CVE-2024-38538 CVE-2024-41080 CVE-2024-50036 CVE-2024-43849 CVE-2024-47673 CVE-2024-43835 CVE-2023-52913 CVE-2024-46849 CVE-2024-44931 CVE-2024-50086 CVE-2024-36972 CVE-2024-50010 CVE-2024-47672 CVE-2024-46853 CVE-2023-52601 CVE-2024-46695 CVE-2024-46855 CVE-2024-43841 CVE-2024-43846 CVE-2024-39463 CVE-2024-46858

[AUTOPATCHER-kernel] Kernel CVE - branch main - CVE-2024-43834 CVE-2024-47670 CVE-2021-47482 CVE-2024-46852 CVE-2024-38545 CVE-2024-47671 CVE-2024-50058 CVE-2022-48635 CVE-2024-46859 CVE-2024-46854 CVE-2024-36893 CVE-2024-26875 CVE-2024-43839 CVE-2024-50072 CVE-2024-38538 CVE-2024-41080 CVE-2024-50036 CVE-2024-43849 CVE-2024-47673 CVE-2024-43835 CVE-2023-52913 CVE-2024-46849 CVE-2024-44931 CVE-2024-50086 CVE-2024-36972 CVE-2024-50010 CVE-2024-47672 CVE-2024-46853 CVE-2023-52601 CVE-2024-46695 CVE-2024-46855 CVE-2024-43841 CVE-2024-43846 CVE-2024-39463 CVE-2024-46858 #1340

# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.
name: Github Merge Conflict Check
on:
push:
branches: [main, dev, 1.0*, 2.0*, 3.0*, fasttrack/*]
pull_request:
branches: [main, dev, 1.0*, 2.0*, 3.0*, fasttrack/*]
jobs:
spec-check:
name: Github Merge Conflict Check
runs-on: ubuntu-latest
steps:
# Checkout the branch of our repo that triggered this action
- name: Workflow trigger checkout
uses: actions/checkout@v4
- name: Get base commit for PRs
if: ${{ github.event_name == 'pull_request' }}
run: |
git fetch origin ${{ github.base_ref }}
echo "base_sha=$(git rev-parse origin/${{ github.base_ref }})" >> $GITHUB_ENV
echo "Merging ${{ github.sha }} into ${{ github.base_ref }}"
- name: Get base commit for Pushes
if: ${{ github.event_name == 'push' }}
run: |
git fetch origin ${{ github.event.before }}
echo "base_sha=${{ github.event.before }}" >> $GITHUB_ENV
echo "Merging ${{ github.sha }} into ${{ github.event.before }}"
- name: Check for merge conflicts
run: |
echo "Files changed: '$(git diff-tree --no-commit-id --name-only -r ${{ env.base_sha }} ${{ github.sha }})'"
changed_files=$(git diff-tree --diff-filter=d --no-commit-id --name-only -r ${{ env.base_sha }} ${{ github.sha }})
merge_conflict_found=false
for file in $changed_files ; do
if [ -f $file ]; then
echo "Checking for merge conflicts in $file"
if grep -H -r "^<<<<<<< HEAD$" $file; then
echo "Merge conflict found in $file"
merge_conflict_found=true
fi
if grep -H -r "^>>>>>>>$" $file; then
echo "Merge conflict found in $file"
merge_conflict_found=true
fi
if grep -H -r "^=======$" $file; then
echo "Merge conflict found in $file"
merge_conflict_found=true
fi
fi
done
if [[ $merge_conflict_found =~ [Tt]rue ]]; then
echo "Merge conflict found in one or more files"
exit 1
fi