From d6811d1b07ad171cb3d32dc281648b1cb985d64c Mon Sep 17 00:00:00 2001 From: mohamed-imas Date: Wed, 11 Mar 2026 12:40:44 -0400 Subject: [PATCH 1/7] direct push to hotifix --- file2.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/file2.txt b/file2.txt index c03716c..5b7be3a 100644 --- a/file2.txt +++ b/file2.txt @@ -1,3 +1,6 @@ This is the secnd file. + + +This is a direct push \ No newline at end of file From ffa69eebbc70ba37df17d55dd9e72eade7cddb1a Mon Sep 17 00:00:00 2001 From: mohamed-imas Date: Wed, 11 Mar 2026 13:00:35 -0400 Subject: [PATCH 2/7] add mergfreez github action --- .github/workflows/merge-freeze.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/merge-freeze.yml diff --git a/.github/workflows/merge-freeze.yml b/.github/workflows/merge-freeze.yml new file mode 100644 index 0000000..c5ad317 --- /dev/null +++ b/.github/workflows/merge-freeze.yml @@ -0,0 +1,22 @@ +{\rtf1\ansi\ansicpg1252\cocoartf2761 +\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +{\*\expandedcolortbl;;} +\paperw11900\paperh16840\margl1440\margr1440\vieww18100\viewh8400\viewkind0 +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 + +\f0\fs24 \cf0 name: Merge Freeze Enforcement\ +on:\ + pull_request_target:\ + types: [opened, reopened, synchronize]\ +\ +jobs:\ + check-freeze:\ + runs-on: ubuntu-latest\ + steps:\ + - name: Check if merge freeze is active\ + run: |\ + if [[ "$\{\{ secrets.MERGE_FREEZE \}\}" == "true" ]]; then\ + echo "Merge freeze is active. Blocking merge."\ + exit 1\ + fi} \ No newline at end of file From f01e4ac363e924cb486c84a46e2a07a523fa7634 Mon Sep 17 00:00:00 2001 From: Imas <95618805+mohamed-imas@users.noreply.github.com> Date: Wed, 11 Mar 2026 13:03:17 -0400 Subject: [PATCH 3/7] Update merge-freeze.yml --- .github/workflows/merge-freeze.yml | 35 ++++++++++++------------------ 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/.github/workflows/merge-freeze.yml b/.github/workflows/merge-freeze.yml index c5ad317..48a5d69 100644 --- a/.github/workflows/merge-freeze.yml +++ b/.github/workflows/merge-freeze.yml @@ -1,22 +1,15 @@ -{\rtf1\ansi\ansicpg1252\cocoartf2761 -\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fswiss\fcharset0 Helvetica;} -{\colortbl;\red255\green255\blue255;} -{\*\expandedcolortbl;;} -\paperw11900\paperh16840\margl1440\margr1440\vieww18100\viewh8400\viewkind0 -\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0 +name: Merge Freeze Enforcement +on: + pull_request_target: + types: [opened, reopened, synchronize] -\f0\fs24 \cf0 name: Merge Freeze Enforcement\ -on:\ - pull_request_target:\ - types: [opened, reopened, synchronize]\ -\ -jobs:\ - check-freeze:\ - runs-on: ubuntu-latest\ - steps:\ - - name: Check if merge freeze is active\ - run: |\ - if [[ "$\{\{ secrets.MERGE_FREEZE \}\}" == "true" ]]; then\ - echo "Merge freeze is active. Blocking merge."\ - exit 1\ - fi} \ No newline at end of file +jobs: + check-freeze: + runs-on: ubuntu-latest + steps: + - name: Check if merge freeze is active + run: | + if [[ "${{ secrets.MERGE_FREEZE }}" == "true" ]]; then + echo "Merge freeze is active. Blocking merge." + exit 1 + fi From 7c02c7f721742485eb14836a6a5ea037ef461968 Mon Sep 17 00:00:00 2001 From: Imas <95618805+mohamed-imas@users.noreply.github.com> Date: Wed, 11 Mar 2026 13:10:06 -0400 Subject: [PATCH 4/7] Update merge-freeze.yml --- .github/workflows/merge-freeze.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge-freeze.yml b/.github/workflows/merge-freeze.yml index 48a5d69..e396469 100644 --- a/.github/workflows/merge-freeze.yml +++ b/.github/workflows/merge-freeze.yml @@ -1,6 +1,6 @@ name: Merge Freeze Enforcement on: - pull_request_target: + pull_request: types: [opened, reopened, synchronize] jobs: From a205b37847ad7e396d49cdad96dfe0cefc24ab92 Mon Sep 17 00:00:00 2001 From: Imas <95618805+mohamed-imas@users.noreply.github.com> Date: Wed, 11 Mar 2026 13:12:47 -0400 Subject: [PATCH 5/7] Update merge-freeze.yml --- .github/workflows/merge-freeze.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/merge-freeze.yml b/.github/workflows/merge-freeze.yml index e396469..186ba2b 100644 --- a/.github/workflows/merge-freeze.yml +++ b/.github/workflows/merge-freeze.yml @@ -13,3 +13,4 @@ jobs: echo "Merge freeze is active. Blocking merge." exit 1 fi + From d74a1a997c6f70664d62e94bc75ba87f4007c565 Mon Sep 17 00:00:00 2001 From: Imas <95618805+mohamed-imas@users.noreply.github.com> Date: Wed, 11 Mar 2026 13:14:22 -0400 Subject: [PATCH 6/7] Update merge-freeze.yml --- .github/workflows/merge-freeze.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/merge-freeze.yml b/.github/workflows/merge-freeze.yml index 186ba2b..626b171 100644 --- a/.github/workflows/merge-freeze.yml +++ b/.github/workflows/merge-freeze.yml @@ -12,5 +12,7 @@ jobs: if [[ "${{ secrets.MERGE_FREEZE }}" == "true" ]]; then echo "Merge freeze is active. Blocking merge." exit 1 + else + echo "Merge freeze not active. PR merge allowed." fi From 9299818a236f9b35773d321cd9de3e359c75e20c Mon Sep 17 00:00:00 2001 From: Imas <95618805+mohamed-imas@users.noreply.github.com> Date: Wed, 11 Mar 2026 13:22:11 -0400 Subject: [PATCH 7/7] Update file10.txt --- file10.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/file10.txt b/file10.txt index 641a486..a3bce3c 100644 --- a/file10.txt +++ b/file10.txt @@ -3,3 +3,5 @@ content of file 10. I file file 10 a lot. I changed evrything here as bulk + +ASdsd