From 41bd54fcb2076e6612ce3ce67bc908ee30fd6362 Mon Sep 17 00:00:00 2001
From: frocode <frocodeof@gmail.com>
Date: Sun, 27 Jul 2025 16:23:28 +0200
Subject: [PATCH 01/64] updea

---
 .github/workflows/summary.yml | 66 +++++++++++++++++++++++++----------
 1 file changed, 48 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/summary.yml b/.github/workflows/summary.yml
index 6b42fb5..eedf627 100644
--- a/.github/workflows/summary.yml
+++ b/.github/workflows/summary.yml
@@ -1,25 +1,55 @@
-
-name: "manual-input-workflow"
+name: manual-revert-workflow
 
 on:
   workflow_dispatch:
-    input:
-      name:
-
-        description: "Branches to revert"
-
-        default:  "World"
-
+    inputs:
+      branch_name:
+        description: "Branch name to find and revert its merge commit in dev"
         required: true
 
-
 jobs:
-
-  check_inputs:
-    runs-on: "ubantu-latest"
-
+  revert-merge:
+    runs-on: ubuntu-latest
+    
     steps:
-
-    - name: Printing greeting
-
-      run: echo "Hello how are you doing"
\ No newline at end of file
+    - name: Checkout repository
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0  # Fetch all history for proper commit lookup
+        
+    - name: Validate branch exists
+      run: |
+        if ! git show-ref --quiet refs/heads/${{ github.event.inputs.branch_name }}; then
+          echo "Error: Branch '${{ github.event.inputs.branch_name }}' does not exist"
+          exit 1
+        fi
+        
+    - name: Switch to dev branch
+      run: git checkout dev
+      
+    - name: Find merge commit
+      id: find_merge
+      run: |
+        MERGE_COMMIT=$(git log --merges --first-parent dev --grep="Merge branch '${{ github.event.inputs.branch_name }}' into dev" --pretty=%H -n 1)
+        if [ -z "$MERGE_COMMIT" ]; then
+          echo "Error: No merge commit found from branch '${{ github.event.inputs.branch_name }}' into dev"
+          exit 1
+        fi
+        echo "merge_commit=$MERGE_COMMIT" >> $GITHUB_OUTPUT
+        
+    - name: Revert merge commit
+      run: |
+        git revert -m 1 ${{ steps.find_merge.outputs.merge_commit }} --no-edit
+        if [ $? -ne 0 ]; then
+          echo "Error: Failed to revert merge commit ${{ steps.find_merge.outputs.merge_commit }}"
+          exit 1
+        fi
+        
+    - name: Push revert to dev
+      run: |
+        git push origin dev
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        
+    - name: Notify success
+      run: echo "Successfully reverted merge commit ${{ steps.find_merge.outputs.merge_commit }} from branch '${{ github.event.inputs.branch_name }}' in dev"
\ No newline at end of file

From 7ee12fcd4f348ddc03d96840e69217cc9159ecca Mon Sep 17 00:00:00 2001
From: frocode <frocodeof@gmail.com>
Date: Sun, 27 Jul 2025 16:33:05 +0200
Subject: [PATCH 02/64] f5_feature_edit

---
 main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.py b/main.py
index 1c83b82..d2a69af 100644
--- a/main.py
+++ b/main.py
@@ -29,4 +29,4 @@ def merge_sorted_arrays(arr1, arr2):
 
 merged = merge_sorted_arrays(arr1, arr2)
 print(merged)  # Output: [1, 2, 3, 4, 5, 6, 7, 8]
-# this line added into the dev branch
\ No newline at end of file
+# This is an f5 feature edit
\ No newline at end of file

From f3d1811456fd258050fa52769f5125697110ecff Mon Sep 17 00:00:00 2001
From: frocode <frocodeof@gmail.com>
Date: Sun, 27 Jul 2025 16:39:20 +0200
Subject: [PATCH 03/64] added 5 v2

---
 main.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/main.py b/main.py
index d2a69af..36e799a 100644
--- a/main.py
+++ b/main.py
@@ -29,4 +29,5 @@ def merge_sorted_arrays(arr1, arr2):
 
 merged = merge_sorted_arrays(arr1, arr2)
 print(merged)  # Output: [1, 2, 3, 4, 5, 6, 7, 8]
-# This is an f5 feature edit
\ No newline at end of file
+# This is an f5 feature edit
+# second commit f5
\ No newline at end of file

From 6be0b7e10bdf3a21e1fe1feaafb848c17f602a2b Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Sun, 27 Jul 2025 16:07:03 +0000
Subject: [PATCH 04/64] Revert "Merge branch 'f5' into dev"

This reverts commit b65a1a2f475c827997518d4a390498938498dbac, reversing
changes made to 7b7a668f33861a4074ed6c06baebc0c9e6995d53.
---
 main.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/main.py b/main.py
index 36e799a..d2a69af 100644
--- a/main.py
+++ b/main.py
@@ -29,5 +29,4 @@ def merge_sorted_arrays(arr1, arr2):
 
 merged = merge_sorted_arrays(arr1, arr2)
 print(merged)  # Output: [1, 2, 3, 4, 5, 6, 7, 8]
-# This is an f5 feature edit
-# second commit f5
\ No newline at end of file
+# This is an f5 feature edit
\ No newline at end of file

From c6c88ec2b4e2835e1307ec3820b64684480be559 Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Sun, 27 Jul 2025 17:01:30 +0000
Subject: [PATCH 05/64] Reapply "Merge branch 'f5' into dev"

This reverts commit 6be0b7e10bdf3a21e1fe1feaafb848c17f602a2b.
---
 main.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/main.py b/main.py
index d2a69af..36e799a 100644
--- a/main.py
+++ b/main.py
@@ -29,4 +29,5 @@ def merge_sorted_arrays(arr1, arr2):
 
 merged = merge_sorted_arrays(arr1, arr2)
 print(merged)  # Output: [1, 2, 3, 4, 5, 6, 7, 8]
-# This is an f5 feature edit
\ No newline at end of file
+# This is an f5 feature edit
+# second commit f5
\ No newline at end of file

From d38520fcb0afe11671555720107e4c71cb74cec9 Mon Sep 17 00:00:00 2001
From: frocode <frocodeof@gmail.com>
Date: Sun, 27 Jul 2025 19:03:48 +0200
Subject: [PATCH 06/64] add

---
 main.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/main.py b/main.py
index d2a69af..8ff1bd5 100644
--- a/main.py
+++ b/main.py
@@ -29,4 +29,5 @@ def merge_sorted_arrays(arr1, arr2):
 
 merged = merge_sorted_arrays(arr1, arr2)
 print(merged)  # Output: [1, 2, 3, 4, 5, 6, 7, 8]
-# This is an f5 feature edit
\ No newline at end of file
+# This is an f5 feature edit
+# this feature has been added from f6
\ No newline at end of file

From b937364faeafa0e9ac3f66294d86888565277016 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Sun, 27 Jul 2025 17:38:51 +0000
Subject: [PATCH 07/64] Revert "Merge pull request #8 from FroCode/f6"

This reverts commit 7034d3c4754ec484377805752df648c21fae691d, reversing
changes made to c6c88ec2b4e2835e1307ec3820b64684480be559.
---
 main.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/main.py b/main.py
index 6810a06..36e799a 100644
--- a/main.py
+++ b/main.py
@@ -30,5 +30,4 @@ def merge_sorted_arrays(arr1, arr2):
 merged = merge_sorted_arrays(arr1, arr2)
 print(merged)  # Output: [1, 2, 3, 4, 5, 6, 7, 8]
 # This is an f5 feature edit
-# this feature has been added from f6
 # second commit f5
\ No newline at end of file

From dd11e8da6c2fa4a1d7b065d7ff43017b365d7a37 Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Mon, 28 Jul 2025 08:40:46 +0000
Subject: [PATCH 08/64] Reapply "Merge pull request #8 from FroCode/f6"

This reverts commit b937364faeafa0e9ac3f66294d86888565277016.
---
 main.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/main.py b/main.py
index 36e799a..6810a06 100644
--- a/main.py
+++ b/main.py
@@ -30,4 +30,5 @@ def merge_sorted_arrays(arr1, arr2):
 merged = merge_sorted_arrays(arr1, arr2)
 print(merged)  # Output: [1, 2, 3, 4, 5, 6, 7, 8]
 # This is an f5 feature edit
+# this feature has been added from f6
 # second commit f5
\ No newline at end of file

From 178b33d1836882e52523f9d5f388656011a98335 Mon Sep 17 00:00:00 2001
From: frocode <frocodeof@gmail.com>
Date: Mon, 28 Jul 2025 10:42:48 +0200
Subject: [PATCH 09/64] added

---
 main.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/main.py b/main.py
index 36e799a..c3b20db 100644
--- a/main.py
+++ b/main.py
@@ -30,4 +30,5 @@ def merge_sorted_arrays(arr1, arr2):
 merged = merge_sorted_arrays(arr1, arr2)
 print(merged)  # Output: [1, 2, 3, 4, 5, 6, 7, 8]
 # This is an f5 feature edit
-# second commit f5
\ No newline at end of file
+# second commit f5
+# Feature 7 added
\ No newline at end of file

From b5436ed8a9d57cf7c86d538166be5c1b77f0e531 Mon Sep 17 00:00:00 2001
From: frocode <frocodeof@gmail.com>
Date: Mon, 28 Jul 2025 10:50:02 +0200
Subject: [PATCH 10/64] update

---
 main.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/main.py b/main.py
index c3b20db..2def0d5 100644
--- a/main.py
+++ b/main.py
@@ -30,5 +30,6 @@ def merge_sorted_arrays(arr1, arr2):
 merged = merge_sorted_arrays(arr1, arr2)
 print(merged)  # Output: [1, 2, 3, 4, 5, 6, 7, 8]
 # This is an f5 feature edit
+# this feature has been added from f6
 # second commit f5
-# Feature 7 added
\ No newline at end of file
+# feature 7 added
\ No newline at end of file

From 1a5eeb7a0e3083ba53e689a821104863679a6496 Mon Sep 17 00:00:00 2001
From: frocode <frocodeof@gmail.com>
Date: Mon, 28 Jul 2025 11:28:28 +0200
Subject: [PATCH 11/64] added

---
 main.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/main.py b/main.py
index 6810a06..8633c39 100644
--- a/main.py
+++ b/main.py
@@ -31,4 +31,5 @@ def merge_sorted_arrays(arr1, arr2):
 print(merged)  # Output: [1, 2, 3, 4, 5, 6, 7, 8]
 # This is an f5 feature edit
 # this feature has been added from f6
-# second commit f5
\ No newline at end of file
+# second commit f5
+# second commit f99
\ No newline at end of file

From 347bde7df867956834b58793b6dbb98e95dfd864 Mon Sep 17 00:00:00 2001
From: MAAMAR HADDOUCHE <frocodeof@gmail.com>
Date: Tue, 29 Jul 2025 13:46:33 +0200
Subject: [PATCH 12/64] f12.txt (#12)

we have here 2 commit in that branch:

* f12.txt

* extra commit to f12
---
 f12.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 f12.txt

diff --git a/f12.txt b/f12.txt
new file mode 100644
index 0000000..5370815
--- /dev/null
+++ b/f12.txt
@@ -0,0 +1,2 @@
+f12.txt
+add extra commit in that feature => f12
\ No newline at end of file

From 430b4dc52b463107735616f3f232cff78f16da5d Mon Sep 17 00:00:00 2001
From: MAAMAR HADDOUCHE <frocodeof@gmail.com>
Date: Tue, 29 Jul 2025 13:47:14 +0200
Subject: [PATCH 13/64] normal commit + publish branch (#13)

---
 f11.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 f11.txt

diff --git a/f11.txt b/f11.txt
new file mode 100644
index 0000000..55c5d2c
--- /dev/null
+++ b/f11.txt
@@ -0,0 +1 @@
+test test normal commit
\ No newline at end of file

From 78115befa634758ce9de855c4dd01159f625c4b7 Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Tue, 29 Jul 2025 11:48:36 +0000
Subject: [PATCH 14/64] Revert commit 430b4dc from f11

---
 f11.txt | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 f11.txt

diff --git a/f11.txt b/f11.txt
deleted file mode 100644
index 55c5d2c..0000000
--- a/f11.txt
+++ /dev/null
@@ -1 +0,0 @@
-test test normal commit
\ No newline at end of file

From a1c67a3445512c4084554c936070b6d21f011424 Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Tue, 29 Jul 2025 11:49:50 +0000
Subject: [PATCH 15/64] Revert commit 78115be from f13

---
 f11.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 f11.txt

diff --git a/f11.txt b/f11.txt
new file mode 100644
index 0000000..55c5d2c
--- /dev/null
+++ b/f11.txt
@@ -0,0 +1 @@
+test test normal commit
\ No newline at end of file

From d8ac81e8afe098c63c7f1db154d78956ee6ad467 Mon Sep 17 00:00:00 2001
From: frocode <frocodeof@gmail.com>
Date: Thu, 31 Jul 2025 10:26:34 +0200
Subject: [PATCH 16/64] ++

---
 f13.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 f13.txt

diff --git a/f13.txt b/f13.txt
new file mode 100644
index 0000000..eb46628
--- /dev/null
+++ b/f13.txt
@@ -0,0 +1,2 @@
+# test commit 14
+# test commit 15
\ No newline at end of file

From 95c987e07addfec6dd811b42813d975fb866e4a1 Mon Sep 17 00:00:00 2001
From: MAAMAR HADDOUCHE <frocodeof@gmail.com>
Date: Thu, 31 Jul 2025 10:28:27 +0200
Subject: [PATCH 17/64] ad (#15)

---
 f13.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/f13.txt b/f13.txt
index eb46628..e45ddbb 100644
--- a/f13.txt
+++ b/f13.txt
@@ -1,2 +1,2 @@
-# test commit 14
+# test commit 17
 # test commit 15
\ No newline at end of file

From faf609312342624c35d98423b6652e03190f3534 Mon Sep 17 00:00:00 2001
From: MAAMAR HADDOUCHE <frocodeof@gmail.com>
Date: Thu, 31 Jul 2025 10:28:55 +0200
Subject: [PATCH 18/64] F13 (#11)

* # test commit 13

* ++
---
 f13.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/f13.txt b/f13.txt
index e45ddbb..d3e43d0 100644
--- a/f13.txt
+++ b/f13.txt
@@ -1,2 +1,3 @@
+
 # test commit 17
-# test commit 15
\ No newline at end of file
+# test commit 15

From f095fcaa551e3a89d54e4020ab9892f94c529e31 Mon Sep 17 00:00:00 2001
From: MAAMAR HADDOUCHE <frocodeof@gmail.com>
Date: Thu, 31 Jul 2025 10:30:27 +0200
Subject: [PATCH 19/64] F15 (#16)

* ad

* sw
---
 f13.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/f13.txt b/f13.txt
index d3e43d0..08fe8fc 100644
--- a/f13.txt
+++ b/f13.txt
@@ -1,3 +1,3 @@
 
-# test commit 17
+# test commit 19
 # test commit 15

From a09c099c8f5a747763631b3209d19a0ed06d2267 Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Thu, 31 Jul 2025 08:31:16 +0000
Subject: [PATCH 20/64] Revert commit f095fca from f15

---
 f13.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/f13.txt b/f13.txt
index 08fe8fc..d3e43d0 100644
--- a/f13.txt
+++ b/f13.txt
@@ -1,3 +1,3 @@
 
-# test commit 19
+# test commit 17
 # test commit 15

From 6b9be6baaa898df8205a308a8e078ed03116a6b4 Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Thu, 31 Jul 2025 08:32:36 +0000
Subject: [PATCH 21/64] Revert commit a09c099 from f15

---
 f13.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/f13.txt b/f13.txt
index d3e43d0..08fe8fc 100644
--- a/f13.txt
+++ b/f13.txt
@@ -1,3 +1,3 @@
 
-# test commit 17
+# test commit 19
 # test commit 15

From 85b65eab2aa10e03aaac52a31797b1528b53de5f Mon Sep 17 00:00:00 2001
From: MAAMAR HADDOUCHE <frocodeof@gmail.com>
Date: Thu, 31 Jul 2025 13:34:04 +0200
Subject: [PATCH 22/64] F15 (#18)

* ad

* sw

* commit 1 from f15
---
 1.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 1.txt

diff --git a/1.txt b/1.txt
new file mode 100644
index 0000000..56a6051
--- /dev/null
+++ b/1.txt
@@ -0,0 +1 @@
+1
\ No newline at end of file

From 7bf7c6e593a7e8fd6f14617c0f5c44b3f10ca504 Mon Sep 17 00:00:00 2001
From: MAAMAR HADDOUCHE <frocodeof@gmail.com>
Date: Thu, 31 Jul 2025 13:37:32 +0200
Subject: [PATCH 23/64] F15 (#19)

* ad

* sw

* commit 1 from f15

* commit 2 file added 2
---
 2.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 2.txt

diff --git a/2.txt b/2.txt
new file mode 100644
index 0000000..79945c4
--- /dev/null
+++ b/2.txt
@@ -0,0 +1 @@
+file 2 added
\ No newline at end of file

From ea6d60400217d22d4e0c3bbf64e34c42cc5d7879 Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Thu, 31 Jul 2025 12:44:43 +0000
Subject: [PATCH 24/64] Revert squash commit
 7bf7c6e593a7e8fd6f14617c0f5c44b3f10ca504 (from branch f15)

---
 2.txt | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 2.txt

diff --git a/2.txt b/2.txt
deleted file mode 100644
index 79945c4..0000000
--- a/2.txt
+++ /dev/null
@@ -1 +0,0 @@
-file 2 added
\ No newline at end of file

From f64d08ecf78877901d1e25326692a3565091aa21 Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Thu, 31 Jul 2025 12:44:43 +0000
Subject: [PATCH 25/64] Revert squash commit
 85b65eab2aa10e03aaac52a31797b1528b53de5f (from branch f15)

---
 1.txt | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 1.txt

diff --git a/1.txt b/1.txt
deleted file mode 100644
index 56a6051..0000000
--- a/1.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file

From 9a6842cb00ae589dbf6289e56615c4276338d49c Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Thu, 31 Jul 2025 12:44:43 +0000
Subject: [PATCH 26/64] Revert squash commit
 6b9be6baaa898df8205a308a8e078ed03116a6b4 (from branch f15)

---
 f13.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/f13.txt b/f13.txt
index 08fe8fc..d3e43d0 100644
--- a/f13.txt
+++ b/f13.txt
@@ -1,3 +1,3 @@
 
-# test commit 19
+# test commit 17
 # test commit 15

From a8ede41c0e35244f17c8a3cf94f7a88d6830dfe6 Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Thu, 31 Jul 2025 12:44:43 +0000
Subject: [PATCH 27/64] Revert squash commit
 a09c099c8f5a747763631b3209d19a0ed06d2267 (from branch f15)

---
 f13.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/f13.txt b/f13.txt
index d3e43d0..08fe8fc 100644
--- a/f13.txt
+++ b/f13.txt
@@ -1,3 +1,3 @@
 
-# test commit 17
+# test commit 19
 # test commit 15

From 3d9c57f89fec9837f23d20a49239a846b6133d06 Mon Sep 17 00:00:00 2001
From: MAAMAR HADDOUCHE <frocodeof@gmail.com>
Date: Thu, 31 Jul 2025 15:17:09 +0200
Subject: [PATCH 28/64] Conflict revert for
 d1c53d6d592f4b82228bd2b0df9bac233e126f2b from f6 (#23)

* Conflict during revert of dd11e8da6c2fa4a1d7b065d7ff43017b365d7a37 from feature f6

* Conflict during revert of b937364faeafa0e9ac3f66294d86888565277016 from feature f6

* Conflict during revert of 7034d3c4754ec484377805752df648c21fae691d from feature f6

* Conflict during revert of d1c53d6d592f4b82228bd2b0df9bac233e126f2b from feature f6

---------

Co-authored-by: GitHub Actions <actions@github.com>
---
 REVERT_CONFLICT.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 REVERT_CONFLICT.md

diff --git a/REVERT_CONFLICT.md b/REVERT_CONFLICT.md
new file mode 100644
index 0000000..5d44fa8
--- /dev/null
+++ b/REVERT_CONFLICT.md
@@ -0,0 +1 @@
+PR auto-created due to conflict while reverting d1c53d6d592f4b82228bd2b0df9bac233e126f2b from feature 'f6'

From e28650141ef5bf697e5c597135b1b3f0f81825f9 Mon Sep 17 00:00:00 2001
From: MAAMAR HADDOUCHE <frocodeof@gmail.com>
Date: Thu, 31 Jul 2025 15:18:56 +0200
Subject: [PATCH 29/64] Conflict revert for
 c6c88ec2b4e2835e1307ec3820b64684480be559 from f6 (#24)

* Conflict during revert of dd11e8da6c2fa4a1d7b065d7ff43017b365d7a37 from feature f6

* Conflict during revert of b937364faeafa0e9ac3f66294d86888565277016 from feature f6

* Conflict during revert of 7034d3c4754ec484377805752df648c21fae691d from feature f6

* Conflict during revert of d1c53d6d592f4b82228bd2b0df9bac233e126f2b from feature f6

* Conflict during revert of c6c88ec2b4e2835e1307ec3820b64684480be559 from feature f6

---------

Co-authored-by: GitHub Actions <actions@github.com>
---
 REVERT_CONFLICT.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/REVERT_CONFLICT.md b/REVERT_CONFLICT.md
index 5d44fa8..e69de29 100644
--- a/REVERT_CONFLICT.md
+++ b/REVERT_CONFLICT.md
@@ -1 +0,0 @@
-PR auto-created due to conflict while reverting d1c53d6d592f4b82228bd2b0df9bac233e126f2b from feature 'f6'

From 2409ac6dd8584911935b7d79ff5e57a765d16ad8 Mon Sep 17 00:00:00 2001
From: MAAMAR HADDOUCHE <frocodeof@gmail.com>
Date: Thu, 31 Jul 2025 15:19:06 +0200
Subject: [PATCH 30/64] Conflict revert for
 7034d3c4754ec484377805752df648c21fae691d from f6 (#22)

* Conflict during revert of dd11e8da6c2fa4a1d7b065d7ff43017b365d7a37 from feature f6

* Conflict during revert of b937364faeafa0e9ac3f66294d86888565277016 from feature f6

* Conflict during revert of 7034d3c4754ec484377805752df648c21fae691d from feature f6

---------

Co-authored-by: GitHub Actions <actions@github.com>
---
 REVERT_CONFLICT.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/REVERT_CONFLICT.md b/REVERT_CONFLICT.md
index e69de29..cdf3f24 100644
--- a/REVERT_CONFLICT.md
+++ b/REVERT_CONFLICT.md
@@ -0,0 +1 @@
+PR auto-created due to conflict while reverting 7034d3c4754ec484377805752df648c21fae691d from feature 'f6'

From 7184cf4160c466b1e2c5c563288c5726855904fb Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Thu, 31 Jul 2025 13:24:01 +0000
Subject: [PATCH 31/64] Revert squash commit
 2409ac6dd8584911935b7d79ff5e57a765d16ad8 (from f6)

---
 REVERT_CONFLICT.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/REVERT_CONFLICT.md b/REVERT_CONFLICT.md
index cdf3f24..e69de29 100644
--- a/REVERT_CONFLICT.md
+++ b/REVERT_CONFLICT.md
@@ -1 +0,0 @@
-PR auto-created due to conflict while reverting 7034d3c4754ec484377805752df648c21fae691d from feature 'f6'

From a9dad160a8e381624e2597f6b3a399d534bf97d9 Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Thu, 31 Jul 2025 13:24:01 +0000
Subject: [PATCH 32/64] Revert squash commit
 e28650141ef5bf697e5c597135b1b3f0f81825f9 (from f6)

---
 REVERT_CONFLICT.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/REVERT_CONFLICT.md b/REVERT_CONFLICT.md
index e69de29..5d44fa8 100644
--- a/REVERT_CONFLICT.md
+++ b/REVERT_CONFLICT.md
@@ -0,0 +1 @@
+PR auto-created due to conflict while reverting d1c53d6d592f4b82228bd2b0df9bac233e126f2b from feature 'f6'

From cb77abfa624d03551259dce49df8d7ffcae77331 Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Thu, 31 Jul 2025 13:24:01 +0000
Subject: [PATCH 33/64] Revert squash commit
 3d9c57f89fec9837f23d20a49239a846b6133d06 (from f6)

---
 REVERT_CONFLICT.md | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 REVERT_CONFLICT.md

diff --git a/REVERT_CONFLICT.md b/REVERT_CONFLICT.md
deleted file mode 100644
index 5d44fa8..0000000
--- a/REVERT_CONFLICT.md
+++ /dev/null
@@ -1 +0,0 @@
-PR auto-created due to conflict while reverting d1c53d6d592f4b82228bd2b0df9bac233e126f2b from feature 'f6'

From 69210d671c5a055f04e758a7281dc3a473809a61 Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Thu, 31 Jul 2025 13:26:08 +0000
Subject: [PATCH 34/64] Revert squash commit
 347bde7df867956834b58793b6dbb98e95dfd864 (from f12)

---
 f12.txt | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 f12.txt

diff --git a/f12.txt b/f12.txt
deleted file mode 100644
index 5370815..0000000
--- a/f12.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-f12.txt
-add extra commit in that feature => f12
\ No newline at end of file

From 9bd2fc55139974627e40c13cf6801abca5c1d96b Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Thu, 31 Jul 2025 15:40:24 +0000
Subject: [PATCH 35/64] Revert squash commit
 a8ede41c0e35244f17c8a3cf94f7a88d6830dfe6 (from f15)

---
 f13.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/f13.txt b/f13.txt
index 08fe8fc..d3e43d0 100644
--- a/f13.txt
+++ b/f13.txt
@@ -1,3 +1,3 @@
 
-# test commit 19
+# test commit 17
 # test commit 15

From 605132f6da368eb7ac11681226e701e70bfa0163 Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Thu, 31 Jul 2025 15:40:24 +0000
Subject: [PATCH 36/64] Revert squash commit
 9a6842cb00ae589dbf6289e56615c4276338d49c (from f15)

---
 f13.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/f13.txt b/f13.txt
index d3e43d0..08fe8fc 100644
--- a/f13.txt
+++ b/f13.txt
@@ -1,3 +1,3 @@
 
-# test commit 17
+# test commit 19
 # test commit 15

From b4d4561b9e865006cce347e762c7b6ccda7c404d Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Thu, 31 Jul 2025 15:40:24 +0000
Subject: [PATCH 37/64] Revert squash commit
 f64d08ecf78877901d1e25326692a3565091aa21 (from f15)

---
 1.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 1.txt

diff --git a/1.txt b/1.txt
new file mode 100644
index 0000000..56a6051
--- /dev/null
+++ b/1.txt
@@ -0,0 +1 @@
+1
\ No newline at end of file

From 0a51f8a7cb811d5bc4fca4f28faadafeb9564267 Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Thu, 31 Jul 2025 15:40:24 +0000
Subject: [PATCH 38/64] Revert squash commit
 ea6d60400217d22d4e0c3bbf64e34c42cc5d7879 (from f15)

---
 2.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 2.txt

diff --git a/2.txt b/2.txt
new file mode 100644
index 0000000..79945c4
--- /dev/null
+++ b/2.txt
@@ -0,0 +1 @@
+file 2 added
\ No newline at end of file

From 8e15f9a7f9f657bdceb73b6dd78ee0d79d880ee1 Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Thu, 31 Jul 2025 16:05:16 +0000
Subject: [PATCH 39/64] Revert squash commit
 0a51f8a7cb811d5bc4fca4f28faadafeb9564267 (from f15)

---
 2.txt | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 2.txt

diff --git a/2.txt b/2.txt
deleted file mode 100644
index 79945c4..0000000
--- a/2.txt
+++ /dev/null
@@ -1 +0,0 @@
-file 2 added
\ No newline at end of file

From 220ade68734e9343be5efa169babcb71a8f23da5 Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Thu, 31 Jul 2025 16:05:16 +0000
Subject: [PATCH 40/64] Revert squash commit
 b4d4561b9e865006cce347e762c7b6ccda7c404d (from f15)

---
 1.txt | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 1.txt

diff --git a/1.txt b/1.txt
deleted file mode 100644
index 56a6051..0000000
--- a/1.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file

From baae91472aa7e61864b986409730857baeeb76b7 Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Thu, 31 Jul 2025 16:05:16 +0000
Subject: [PATCH 41/64] Revert squash commit
 605132f6da368eb7ac11681226e701e70bfa0163 (from f15)

---
 f13.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/f13.txt b/f13.txt
index 08fe8fc..d3e43d0 100644
--- a/f13.txt
+++ b/f13.txt
@@ -1,3 +1,3 @@
 
-# test commit 19
+# test commit 17
 # test commit 15

From b367c23f85d20570df86d239844fa034e76f012e Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Thu, 31 Jul 2025 16:05:16 +0000
Subject: [PATCH 42/64] Revert squash commit
 9bd2fc55139974627e40c13cf6801abca5c1d96b (from f15)

---
 f13.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/f13.txt b/f13.txt
index d3e43d0..08fe8fc 100644
--- a/f13.txt
+++ b/f13.txt
@@ -1,3 +1,3 @@
 
-# test commit 17
+# test commit 19
 # test commit 15

From d1ac4904042a63e97786e10ab46b97623131528c Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Thu, 31 Jul 2025 16:18:21 +0000
Subject: [PATCH 43/64] Revert "Revert squash commit
 9bd2fc55139974627e40c13cf6801abca5c1d96b (from f15)"

This reverts commit b367c23f85d20570df86d239844fa034e76f012e.
---
 f13.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/f13.txt b/f13.txt
index 08fe8fc..d3e43d0 100644
--- a/f13.txt
+++ b/f13.txt
@@ -1,3 +1,3 @@
 
-# test commit 19
+# test commit 17
 # test commit 15

From 0805058657483a988929007c5b482813f2ba2284 Mon Sep 17 00:00:00 2001
From: MAAMAR HADDOUCHE <frocodeof@gmail.com>
Date: Thu, 31 Jul 2025 18:20:24 +0200
Subject: [PATCH 44/64] F15 (#33)

* ad

* sw

* commit 1 from f15

* commit 2 file added 2

* de
---
 1.txt   | 1 +
 2.txt   | 1 +
 f13.txt | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 1.txt
 create mode 100644 2.txt

diff --git a/1.txt b/1.txt
new file mode 100644
index 0000000..b5045cc
--- /dev/null
+++ b/1.txt
@@ -0,0 +1 @@
+21
\ No newline at end of file
diff --git a/2.txt b/2.txt
new file mode 100644
index 0000000..79945c4
--- /dev/null
+++ b/2.txt
@@ -0,0 +1 @@
+file 2 added
\ No newline at end of file
diff --git a/f13.txt b/f13.txt
index d3e43d0..08fe8fc 100644
--- a/f13.txt
+++ b/f13.txt
@@ -1,3 +1,3 @@
 
-# test commit 17
+# test commit 19
 # test commit 15

From 05f30be5c6c5c77ba394412e6b59335ce713e51d Mon Sep 17 00:00:00 2001
From: MAAMAR HADDOUCHE <frocodeof@gmail.com>
Date: Thu, 31 Jul 2025 18:21:14 +0200
Subject: [PATCH 45/64] F15 (#34)

* ad

* sw

* commit 1 from f15

* commit 2 file added 2

* de

* de
---
 1.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/1.txt b/1.txt
index b5045cc..da2d398 100644
--- a/1.txt
+++ b/1.txt
@@ -1 +1 @@
-21
\ No newline at end of file
+14
\ No newline at end of file

From be8d2526eb9d0c66ede31c542ca28598c06d6fe7 Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Thu, 31 Jul 2025 16:21:53 +0000
Subject: [PATCH 46/64] Revert "F15 (#34)"

This reverts commit 05f30be5c6c5c77ba394412e6b59335ce713e51d.
---
 1.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/1.txt b/1.txt
index da2d398..b5045cc 100644
--- a/1.txt
+++ b/1.txt
@@ -1 +1 @@
-14
\ No newline at end of file
+21
\ No newline at end of file

From 3adbcc766a730dcf8ddcead74e58439e37adc3ba Mon Sep 17 00:00:00 2001
From: MAAMAR HADDOUCHE <frocodeof@gmail.com>
Date: Sun, 3 Aug 2025 23:24:59 +0200
Subject: [PATCH 47/64] F15 (#35)

* ad

* sw

* commit 1 from f15

* commit 2 file added 2

* de

* de

* ded
---
 1.txt | 2 +-
 2.txt | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/1.txt b/1.txt
index b5045cc..da2d398 100644
--- a/1.txt
+++ b/1.txt
@@ -1 +1 @@
-21
\ No newline at end of file
+14
\ No newline at end of file
diff --git a/2.txt b/2.txt
index 79945c4..e69de29 100644
--- a/2.txt
+++ b/2.txt
@@ -1 +0,0 @@
-file 2 added
\ No newline at end of file

From 18dfa3e6afb8bd8b2cab964a98c0da037b5cb803 Mon Sep 17 00:00:00 2001
From: MAAMAR HADDOUCHE <frocodeof@gmail.com>
Date: Sun, 3 Aug 2025 23:25:51 +0200
Subject: [PATCH 48/64] F15 (#36)

* ad

* sw

* commit 1 from f15

* commit 2 file added 2

* de

* de

* ded

* de
---
 f11.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/f11.txt b/f11.txt
index 55c5d2c..216779a 100644
--- a/f11.txt
+++ b/f11.txt
@@ -1 +1 @@
-test test normal commit
\ No newline at end of file
+test test normal commi++
\ No newline at end of file

From db3d78ceac3feea2c0f134ecf723dde6d4365da5 Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Sun, 3 Aug 2025 21:26:10 +0000
Subject: [PATCH 49/64] Revert "F15 (#36)"

This reverts commit 18dfa3e6afb8bd8b2cab964a98c0da037b5cb803.
---
 f11.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/f11.txt b/f11.txt
index 216779a..55c5d2c 100644
--- a/f11.txt
+++ b/f11.txt
@@ -1 +1 @@
-test test normal commi++
\ No newline at end of file
+test test normal commit
\ No newline at end of file

From 32fe0851a447bd0323d2afa4313c81ef409ef66e Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Fri, 22 Aug 2025 09:41:39 +0000
Subject: [PATCH 50/64] from f13

---
 .github/workflows/squash-merge-into-dev.yml | 109 +++++++++++++++++++
 .github/workflows/test_to_prod.yaml         | 110 ++++++++++++++++++++
 f11.txt                                     |   1 -
 f13.txt                                     |   3 -
 4 files changed, 219 insertions(+), 4 deletions(-)
 create mode 100644 .github/workflows/squash-merge-into-dev.yml
 create mode 100644 .github/workflows/test_to_prod.yaml

diff --git a/.github/workflows/squash-merge-into-dev.yml b/.github/workflows/squash-merge-into-dev.yml
new file mode 100644
index 0000000..f773ee3
--- /dev/null
+++ b/.github/workflows/squash-merge-into-dev.yml
@@ -0,0 +1,109 @@
+name: squash-merge-into-dev
+
+on:
+  workflow_dispatch:
+    inputs:
+      pr_number:
+        description: "Pull Request Number (e.g. 123)"
+        required: true
+    
+jobs:
+  squash-merge:
+    runs-on: ubuntu-latest
+
+    steps:
+      # Checkout repository
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.PAT }}
+
+      # Configure Git
+      - name: Configure Git
+        run: |
+          git config --global user.name "GitHub Actions"
+          git config --global user.email "actions@github.com"
+
+      # Fetch PR branch info
+      - name: Get PR branch name
+        id: pr_info
+        run: |
+          BRANCH_NAME=$(gh pr view ${{ github.event.inputs.pr_number }} --json headRefName -q ".headRefName")
+          echo "branch_name=$BRANCH_NAME" >> $GITHUB_ENV
+        env:
+          GH_TOKEN: ${{ secrets.PAT }}
+
+      # Check for duplicate commit in dev
+      - name: Check if commit message already exists in dev
+        id: check_commit
+        run: |
+          git fetch origin dev
+          git checkout dev
+          COMMIT_MSG="from ${{ env.branch_name }}"
+          if git log --pretty=format:"%s" origin/dev | grep -q "^$COMMIT_MSG$"; then
+            echo "duplicate=true" >> $GITHUB_OUTPUT
+          else
+            echo "duplicate=false" >> $GITHUB_OUTPUT
+          fi
+
+      # Trigger revert branch workflow if duplicate found
+      - name: Trigger revert workflow
+        if: steps.check_commit.outputs.duplicate == 'true'
+        uses: peter-evans/workflow-dispatch@v2
+        with:
+          token: ${{ secrets.PAT }}
+          repository: ${{ github.repository }}
+          workflow: manual-revert-workflow.yml
+          ref: dev
+          inputs:
+            branch_name: ${{ env.branch_name }}
+
+      # Wait for revert workflow to finish
+      - name: Wait for revert to complete
+        if: steps.check_commit.outputs.duplicate == 'true'
+        run: |
+          echo "Waiting for revert workflow to finish..."
+          sleep 30
+
+      # Retry squash merge after revert OR first attempt
+      - name: Squash merge PR into dev
+        id: merge
+        run: |
+          git fetch origin
+          git checkout dev
+          git pull origin dev
+
+          # Fetch PR branch
+          git fetch origin ${{ env.branch_name }}
+
+          set +e
+          git merge origin/${{ env.branch_name }} --squash
+          STATUS=$?
+          set -e
+
+          if [ $STATUS -ne 0 ]; then
+            echo "Merge conflict detected!"
+            echo "conflict=true" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+
+          git commit -m "from ${{ env.branch_name }}"
+          git push origin dev
+          echo "conflict=false" >> $GITHUB_OUTPUT
+
+      # Fail workflow if merge conflict detected
+      - name: Fail on conflict
+        if: steps.merge.outputs.conflict == 'true'
+        run: |
+          echo "❌ Merge conflict detected while merging ${{ env.branch_name }} into dev."
+          echo "Please create a PR and resolve conflicts manually."
+          exit 1
+
+      # Comment on PR after successful merge
+      - name: Comment on PR
+        if: steps.merge.outputs.conflict == 'false'
+        run: |
+          gh pr comment ${{ github.event.inputs.pr_number }} --body "✅ Successfully squash merged into dev with commit: from ${{ env.branch_name }}"
+        env:
+          GH_TOKEN: ${{ secrets.PAT }}
diff --git a/.github/workflows/test_to_prod.yaml b/.github/workflows/test_to_prod.yaml
new file mode 100644
index 0000000..8987090
--- /dev/null
+++ b/.github/workflows/test_to_prod.yaml
@@ -0,0 +1,110 @@
+name: push-test-to-prod
+
+on:
+  workflow_run:
+    workflows: ["manual-revert-workflow"]
+    types:
+      - completed
+  workflow_dispatch:
+    inputs:
+      force_push:
+        description: "Force push test to prod (overwrites prod branch)"
+        required: false
+        default: "false"
+
+jobs:
+  push-to-prod:
+    runs-on: ubuntu-latest
+    if: github.event.workflow_run.conclusion == 'success'
+
+    steps:
+      # Checkout repository
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.PAT }}
+
+      # Configure Git
+      - name: Configure Git
+        run: |
+          git config --global user.name "GitHub Actions"
+          git config --global user.email "actions@github.com"
+
+      # Validate branches
+      - name: Validate branches
+        run: |
+          git fetch origin
+          if ! git ls-remote --heads origin test | grep -q test; then
+            echo "Error: test branch does not exist"
+            exit 1
+          fi
+          if ! git ls-remote --heads origin prod | grep -q prod; then
+            echo "Creating prod branch from test"
+            git checkout test
+            git push origin test:prod
+            exit 0
+          fi
+
+      # Push test to prod
+      - name: Push test to prod
+        id: push
+        run: |
+          git checkout prod
+          git fetch origin test
+          set +e
+          git merge origin/test --no-ff --no-edit
+          STATUS=$?
+          set -e
+          if [ $STATUS -ne 0 ]; then
+            echo "Merge conflict detected"
+            TIMESTAMP=$(date +%s)
+            CONFLICT_BRANCH="conflict/test-to-prod-$TIMESTAMP"
+            git checkout -b "$CONFLICT_BRANCH"
+            git push origin "$CONFLICT_BRANCH"
+            gh pr create \
+              --base prod \
+              --head "$CONFLICT_BRANCH" \
+              --title "Merge conflict: test to prod" \
+              --body "Automatic PR: Conflicts occurred while merging test into prod. Please resolve manually."
+            echo "conflict=true" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+          git push origin prod
+          echo "conflict=false" >> $GITHUB_OUTPUT
+        env:
+          GH_TOKEN: ${{ secrets.PAT }}
+
+      # Force push if requested
+      - name: Force push test to prod
+        if: github.event.inputs.force_push == 'true' && steps.push.outputs.conflict == 'false'
+        run: |
+          git checkout test
+          git push origin test:prod --force
+          echo "Force pushed test to prod"
+        env:
+          GH_TOKEN: ${{ secrets.PAT }}
+
+      # Validate prod branch
+      - name: Validate prod branch
+        if: steps.push.outputs.conflict == 'false'
+        run: |
+          git fetch origin prod
+          git checkout prod
+          MERGE_COMMIT=$(git log --merges --pretty=%H -n 1)
+          if [ -z "$MERGE_COMMIT" ]; then
+            echo "No merge commit found in prod branch"
+            exit 1
+          fi
+          echo "Merge commit validated: $MERGE_COMMIT"
+
+      # Notify on merge conflict
+      - name: Notify on merge conflict
+        if: steps.push.outputs.conflict == 'true'
+        run: |
+          gh issue create \
+            --title "Merge Conflict: Test to Prod" \
+            --body "Merge conflict occurred while merging test into prod. Conflict branch created. Check PR for details." \
+            --repo ${{ github.repository }}
+        env:
+          GH_TOKEN: ${{ secrets.PAT }}
diff --git a/f11.txt b/f11.txt
index 55c5d2c..e69de29 100644
--- a/f11.txt
+++ b/f11.txt
@@ -1 +0,0 @@
-test test normal commit
\ No newline at end of file
diff --git a/f13.txt b/f13.txt
index 08fe8fc..e69de29 100644
--- a/f13.txt
+++ b/f13.txt
@@ -1,3 +0,0 @@
-
-# test commit 19
-# test commit 15

From 3ba070defe089ca7adbbe8471604b904f36add7a Mon Sep 17 00:00:00 2001
From: MAAMAR HADDOUCHE <frocodeof@gmail.com>
Date: Fri, 22 Aug 2025 11:45:00 +0200
Subject: [PATCH 51/64] F13 (#37)

* # test commit 13

* ++

* added

From 6483cfb84357c10085c769d3d61e9fcd17eb00d2 Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Fri, 22 Aug 2025 10:18:55 +0000
Subject: [PATCH 52/64] Revert "from f13"

This reverts commit 32fe0851a447bd0323d2afa4313c81ef409ef66e.
---
 .github/workflows/squash-merge-into-dev.yml | 109 -------------------
 .github/workflows/test_to_prod.yaml         | 110 --------------------
 f11.txt                                     |   1 +
 f13.txt                                     |   3 +
 4 files changed, 4 insertions(+), 219 deletions(-)
 delete mode 100644 .github/workflows/squash-merge-into-dev.yml
 delete mode 100644 .github/workflows/test_to_prod.yaml

diff --git a/.github/workflows/squash-merge-into-dev.yml b/.github/workflows/squash-merge-into-dev.yml
deleted file mode 100644
index f773ee3..0000000
--- a/.github/workflows/squash-merge-into-dev.yml
+++ /dev/null
@@ -1,109 +0,0 @@
-name: squash-merge-into-dev
-
-on:
-  workflow_dispatch:
-    inputs:
-      pr_number:
-        description: "Pull Request Number (e.g. 123)"
-        required: true
-    
-jobs:
-  squash-merge:
-    runs-on: ubuntu-latest
-
-    steps:
-      # Checkout repository
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.PAT }}
-
-      # Configure Git
-      - name: Configure Git
-        run: |
-          git config --global user.name "GitHub Actions"
-          git config --global user.email "actions@github.com"
-
-      # Fetch PR branch info
-      - name: Get PR branch name
-        id: pr_info
-        run: |
-          BRANCH_NAME=$(gh pr view ${{ github.event.inputs.pr_number }} --json headRefName -q ".headRefName")
-          echo "branch_name=$BRANCH_NAME" >> $GITHUB_ENV
-        env:
-          GH_TOKEN: ${{ secrets.PAT }}
-
-      # Check for duplicate commit in dev
-      - name: Check if commit message already exists in dev
-        id: check_commit
-        run: |
-          git fetch origin dev
-          git checkout dev
-          COMMIT_MSG="from ${{ env.branch_name }}"
-          if git log --pretty=format:"%s" origin/dev | grep -q "^$COMMIT_MSG$"; then
-            echo "duplicate=true" >> $GITHUB_OUTPUT
-          else
-            echo "duplicate=false" >> $GITHUB_OUTPUT
-          fi
-
-      # Trigger revert branch workflow if duplicate found
-      - name: Trigger revert workflow
-        if: steps.check_commit.outputs.duplicate == 'true'
-        uses: peter-evans/workflow-dispatch@v2
-        with:
-          token: ${{ secrets.PAT }}
-          repository: ${{ github.repository }}
-          workflow: manual-revert-workflow.yml
-          ref: dev
-          inputs:
-            branch_name: ${{ env.branch_name }}
-
-      # Wait for revert workflow to finish
-      - name: Wait for revert to complete
-        if: steps.check_commit.outputs.duplicate == 'true'
-        run: |
-          echo "Waiting for revert workflow to finish..."
-          sleep 30
-
-      # Retry squash merge after revert OR first attempt
-      - name: Squash merge PR into dev
-        id: merge
-        run: |
-          git fetch origin
-          git checkout dev
-          git pull origin dev
-
-          # Fetch PR branch
-          git fetch origin ${{ env.branch_name }}
-
-          set +e
-          git merge origin/${{ env.branch_name }} --squash
-          STATUS=$?
-          set -e
-
-          if [ $STATUS -ne 0 ]; then
-            echo "Merge conflict detected!"
-            echo "conflict=true" >> $GITHUB_OUTPUT
-            exit 0
-          fi
-
-          git commit -m "from ${{ env.branch_name }}"
-          git push origin dev
-          echo "conflict=false" >> $GITHUB_OUTPUT
-
-      # Fail workflow if merge conflict detected
-      - name: Fail on conflict
-        if: steps.merge.outputs.conflict == 'true'
-        run: |
-          echo "❌ Merge conflict detected while merging ${{ env.branch_name }} into dev."
-          echo "Please create a PR and resolve conflicts manually."
-          exit 1
-
-      # Comment on PR after successful merge
-      - name: Comment on PR
-        if: steps.merge.outputs.conflict == 'false'
-        run: |
-          gh pr comment ${{ github.event.inputs.pr_number }} --body "✅ Successfully squash merged into dev with commit: from ${{ env.branch_name }}"
-        env:
-          GH_TOKEN: ${{ secrets.PAT }}
diff --git a/.github/workflows/test_to_prod.yaml b/.github/workflows/test_to_prod.yaml
deleted file mode 100644
index 8987090..0000000
--- a/.github/workflows/test_to_prod.yaml
+++ /dev/null
@@ -1,110 +0,0 @@
-name: push-test-to-prod
-
-on:
-  workflow_run:
-    workflows: ["manual-revert-workflow"]
-    types:
-      - completed
-  workflow_dispatch:
-    inputs:
-      force_push:
-        description: "Force push test to prod (overwrites prod branch)"
-        required: false
-        default: "false"
-
-jobs:
-  push-to-prod:
-    runs-on: ubuntu-latest
-    if: github.event.workflow_run.conclusion == 'success'
-
-    steps:
-      # Checkout repository
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.PAT }}
-
-      # Configure Git
-      - name: Configure Git
-        run: |
-          git config --global user.name "GitHub Actions"
-          git config --global user.email "actions@github.com"
-
-      # Validate branches
-      - name: Validate branches
-        run: |
-          git fetch origin
-          if ! git ls-remote --heads origin test | grep -q test; then
-            echo "Error: test branch does not exist"
-            exit 1
-          fi
-          if ! git ls-remote --heads origin prod | grep -q prod; then
-            echo "Creating prod branch from test"
-            git checkout test
-            git push origin test:prod
-            exit 0
-          fi
-
-      # Push test to prod
-      - name: Push test to prod
-        id: push
-        run: |
-          git checkout prod
-          git fetch origin test
-          set +e
-          git merge origin/test --no-ff --no-edit
-          STATUS=$?
-          set -e
-          if [ $STATUS -ne 0 ]; then
-            echo "Merge conflict detected"
-            TIMESTAMP=$(date +%s)
-            CONFLICT_BRANCH="conflict/test-to-prod-$TIMESTAMP"
-            git checkout -b "$CONFLICT_BRANCH"
-            git push origin "$CONFLICT_BRANCH"
-            gh pr create \
-              --base prod \
-              --head "$CONFLICT_BRANCH" \
-              --title "Merge conflict: test to prod" \
-              --body "Automatic PR: Conflicts occurred while merging test into prod. Please resolve manually."
-            echo "conflict=true" >> $GITHUB_OUTPUT
-            exit 0
-          fi
-          git push origin prod
-          echo "conflict=false" >> $GITHUB_OUTPUT
-        env:
-          GH_TOKEN: ${{ secrets.PAT }}
-
-      # Force push if requested
-      - name: Force push test to prod
-        if: github.event.inputs.force_push == 'true' && steps.push.outputs.conflict == 'false'
-        run: |
-          git checkout test
-          git push origin test:prod --force
-          echo "Force pushed test to prod"
-        env:
-          GH_TOKEN: ${{ secrets.PAT }}
-
-      # Validate prod branch
-      - name: Validate prod branch
-        if: steps.push.outputs.conflict == 'false'
-        run: |
-          git fetch origin prod
-          git checkout prod
-          MERGE_COMMIT=$(git log --merges --pretty=%H -n 1)
-          if [ -z "$MERGE_COMMIT" ]; then
-            echo "No merge commit found in prod branch"
-            exit 1
-          fi
-          echo "Merge commit validated: $MERGE_COMMIT"
-
-      # Notify on merge conflict
-      - name: Notify on merge conflict
-        if: steps.push.outputs.conflict == 'true'
-        run: |
-          gh issue create \
-            --title "Merge Conflict: Test to Prod" \
-            --body "Merge conflict occurred while merging test into prod. Conflict branch created. Check PR for details." \
-            --repo ${{ github.repository }}
-        env:
-          GH_TOKEN: ${{ secrets.PAT }}
diff --git a/f11.txt b/f11.txt
index e69de29..55c5d2c 100644
--- a/f11.txt
+++ b/f11.txt
@@ -0,0 +1 @@
+test test normal commit
\ No newline at end of file
diff --git a/f13.txt b/f13.txt
index e69de29..08fe8fc 100644
--- a/f13.txt
+++ b/f13.txt
@@ -0,0 +1,3 @@
+
+# test commit 19
+# test commit 15

From 3950f351b28f62f78431e6b224a0c398431f261d Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Fri, 22 Aug 2025 10:20:12 +0000
Subject: [PATCH 53/64] from f13

---
 .github/workflows/squash-merge-into-dev.yml | 109 +++++++++++++++++++
 .github/workflows/test_to_prod.yaml         | 110 ++++++++++++++++++++
 2.txt                                       |   1 +
 f11.txt                                     |   1 -
 f13.txt                                     |   3 -
 5 files changed, 220 insertions(+), 4 deletions(-)
 create mode 100644 .github/workflows/squash-merge-into-dev.yml
 create mode 100644 .github/workflows/test_to_prod.yaml

diff --git a/.github/workflows/squash-merge-into-dev.yml b/.github/workflows/squash-merge-into-dev.yml
new file mode 100644
index 0000000..f773ee3
--- /dev/null
+++ b/.github/workflows/squash-merge-into-dev.yml
@@ -0,0 +1,109 @@
+name: squash-merge-into-dev
+
+on:
+  workflow_dispatch:
+    inputs:
+      pr_number:
+        description: "Pull Request Number (e.g. 123)"
+        required: true
+    
+jobs:
+  squash-merge:
+    runs-on: ubuntu-latest
+
+    steps:
+      # Checkout repository
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.PAT }}
+
+      # Configure Git
+      - name: Configure Git
+        run: |
+          git config --global user.name "GitHub Actions"
+          git config --global user.email "actions@github.com"
+
+      # Fetch PR branch info
+      - name: Get PR branch name
+        id: pr_info
+        run: |
+          BRANCH_NAME=$(gh pr view ${{ github.event.inputs.pr_number }} --json headRefName -q ".headRefName")
+          echo "branch_name=$BRANCH_NAME" >> $GITHUB_ENV
+        env:
+          GH_TOKEN: ${{ secrets.PAT }}
+
+      # Check for duplicate commit in dev
+      - name: Check if commit message already exists in dev
+        id: check_commit
+        run: |
+          git fetch origin dev
+          git checkout dev
+          COMMIT_MSG="from ${{ env.branch_name }}"
+          if git log --pretty=format:"%s" origin/dev | grep -q "^$COMMIT_MSG$"; then
+            echo "duplicate=true" >> $GITHUB_OUTPUT
+          else
+            echo "duplicate=false" >> $GITHUB_OUTPUT
+          fi
+
+      # Trigger revert branch workflow if duplicate found
+      - name: Trigger revert workflow
+        if: steps.check_commit.outputs.duplicate == 'true'
+        uses: peter-evans/workflow-dispatch@v2
+        with:
+          token: ${{ secrets.PAT }}
+          repository: ${{ github.repository }}
+          workflow: manual-revert-workflow.yml
+          ref: dev
+          inputs:
+            branch_name: ${{ env.branch_name }}
+
+      # Wait for revert workflow to finish
+      - name: Wait for revert to complete
+        if: steps.check_commit.outputs.duplicate == 'true'
+        run: |
+          echo "Waiting for revert workflow to finish..."
+          sleep 30
+
+      # Retry squash merge after revert OR first attempt
+      - name: Squash merge PR into dev
+        id: merge
+        run: |
+          git fetch origin
+          git checkout dev
+          git pull origin dev
+
+          # Fetch PR branch
+          git fetch origin ${{ env.branch_name }}
+
+          set +e
+          git merge origin/${{ env.branch_name }} --squash
+          STATUS=$?
+          set -e
+
+          if [ $STATUS -ne 0 ]; then
+            echo "Merge conflict detected!"
+            echo "conflict=true" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+
+          git commit -m "from ${{ env.branch_name }}"
+          git push origin dev
+          echo "conflict=false" >> $GITHUB_OUTPUT
+
+      # Fail workflow if merge conflict detected
+      - name: Fail on conflict
+        if: steps.merge.outputs.conflict == 'true'
+        run: |
+          echo "❌ Merge conflict detected while merging ${{ env.branch_name }} into dev."
+          echo "Please create a PR and resolve conflicts manually."
+          exit 1
+
+      # Comment on PR after successful merge
+      - name: Comment on PR
+        if: steps.merge.outputs.conflict == 'false'
+        run: |
+          gh pr comment ${{ github.event.inputs.pr_number }} --body "✅ Successfully squash merged into dev with commit: from ${{ env.branch_name }}"
+        env:
+          GH_TOKEN: ${{ secrets.PAT }}
diff --git a/.github/workflows/test_to_prod.yaml b/.github/workflows/test_to_prod.yaml
new file mode 100644
index 0000000..8987090
--- /dev/null
+++ b/.github/workflows/test_to_prod.yaml
@@ -0,0 +1,110 @@
+name: push-test-to-prod
+
+on:
+  workflow_run:
+    workflows: ["manual-revert-workflow"]
+    types:
+      - completed
+  workflow_dispatch:
+    inputs:
+      force_push:
+        description: "Force push test to prod (overwrites prod branch)"
+        required: false
+        default: "false"
+
+jobs:
+  push-to-prod:
+    runs-on: ubuntu-latest
+    if: github.event.workflow_run.conclusion == 'success'
+
+    steps:
+      # Checkout repository
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.PAT }}
+
+      # Configure Git
+      - name: Configure Git
+        run: |
+          git config --global user.name "GitHub Actions"
+          git config --global user.email "actions@github.com"
+
+      # Validate branches
+      - name: Validate branches
+        run: |
+          git fetch origin
+          if ! git ls-remote --heads origin test | grep -q test; then
+            echo "Error: test branch does not exist"
+            exit 1
+          fi
+          if ! git ls-remote --heads origin prod | grep -q prod; then
+            echo "Creating prod branch from test"
+            git checkout test
+            git push origin test:prod
+            exit 0
+          fi
+
+      # Push test to prod
+      - name: Push test to prod
+        id: push
+        run: |
+          git checkout prod
+          git fetch origin test
+          set +e
+          git merge origin/test --no-ff --no-edit
+          STATUS=$?
+          set -e
+          if [ $STATUS -ne 0 ]; then
+            echo "Merge conflict detected"
+            TIMESTAMP=$(date +%s)
+            CONFLICT_BRANCH="conflict/test-to-prod-$TIMESTAMP"
+            git checkout -b "$CONFLICT_BRANCH"
+            git push origin "$CONFLICT_BRANCH"
+            gh pr create \
+              --base prod \
+              --head "$CONFLICT_BRANCH" \
+              --title "Merge conflict: test to prod" \
+              --body "Automatic PR: Conflicts occurred while merging test into prod. Please resolve manually."
+            echo "conflict=true" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+          git push origin prod
+          echo "conflict=false" >> $GITHUB_OUTPUT
+        env:
+          GH_TOKEN: ${{ secrets.PAT }}
+
+      # Force push if requested
+      - name: Force push test to prod
+        if: github.event.inputs.force_push == 'true' && steps.push.outputs.conflict == 'false'
+        run: |
+          git checkout test
+          git push origin test:prod --force
+          echo "Force pushed test to prod"
+        env:
+          GH_TOKEN: ${{ secrets.PAT }}
+
+      # Validate prod branch
+      - name: Validate prod branch
+        if: steps.push.outputs.conflict == 'false'
+        run: |
+          git fetch origin prod
+          git checkout prod
+          MERGE_COMMIT=$(git log --merges --pretty=%H -n 1)
+          if [ -z "$MERGE_COMMIT" ]; then
+            echo "No merge commit found in prod branch"
+            exit 1
+          fi
+          echo "Merge commit validated: $MERGE_COMMIT"
+
+      # Notify on merge conflict
+      - name: Notify on merge conflict
+        if: steps.push.outputs.conflict == 'true'
+        run: |
+          gh issue create \
+            --title "Merge Conflict: Test to Prod" \
+            --body "Merge conflict occurred while merging test into prod. Conflict branch created. Check PR for details." \
+            --repo ${{ github.repository }}
+        env:
+          GH_TOKEN: ${{ secrets.PAT }}
diff --git a/2.txt b/2.txt
index e69de29..a3c4398 100644
--- a/2.txt
+++ b/2.txt
@@ -0,0 +1 @@
+sdws
\ No newline at end of file
diff --git a/f11.txt b/f11.txt
index 55c5d2c..e69de29 100644
--- a/f11.txt
+++ b/f11.txt
@@ -1 +0,0 @@
-test test normal commit
\ No newline at end of file
diff --git a/f13.txt b/f13.txt
index 08fe8fc..e69de29 100644
--- a/f13.txt
+++ b/f13.txt
@@ -1,3 +0,0 @@
-
-# test commit 19
-# test commit 15

From 458cc47516a9babd6f03c3173949d53d1b9138f8 Mon Sep 17 00:00:00 2001
From: GitHub Actions <actions@github.com>
Date: Fri, 22 Aug 2025 10:29:05 +0000
Subject: [PATCH 54/64] Revert "from f13"

This reverts commit 3950f351b28f62f78431e6b224a0c398431f261d.
---
 .github/workflows/squash-merge-into-dev.yml | 109 -------------------
 .github/workflows/test_to_prod.yaml         | 110 --------------------
 2.txt                                       |   1 -
 f11.txt                                     |   1 +
 f13.txt                                     |   3 +
 5 files changed, 4 insertions(+), 220 deletions(-)
 delete mode 100644 .github/workflows/squash-merge-into-dev.yml
 delete mode 100644 .github/workflows/test_to_prod.yaml

diff --git a/.github/workflows/squash-merge-into-dev.yml b/.github/workflows/squash-merge-into-dev.yml
deleted file mode 100644
index f773ee3..0000000
--- a/.github/workflows/squash-merge-into-dev.yml
+++ /dev/null
@@ -1,109 +0,0 @@
-name: squash-merge-into-dev
-
-on:
-  workflow_dispatch:
-    inputs:
-      pr_number:
-        description: "Pull Request Number (e.g. 123)"
-        required: true
-    
-jobs:
-  squash-merge:
-    runs-on: ubuntu-latest
-
-    steps:
-      # Checkout repository
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.PAT }}
-
-      # Configure Git
-      - name: Configure Git
-        run: |
-          git config --global user.name "GitHub Actions"
-          git config --global user.email "actions@github.com"
-
-      # Fetch PR branch info
-      - name: Get PR branch name
-        id: pr_info
-        run: |
-          BRANCH_NAME=$(gh pr view ${{ github.event.inputs.pr_number }} --json headRefName -q ".headRefName")
-          echo "branch_name=$BRANCH_NAME" >> $GITHUB_ENV
-        env:
-          GH_TOKEN: ${{ secrets.PAT }}
-
-      # Check for duplicate commit in dev
-      - name: Check if commit message already exists in dev
-        id: check_commit
-        run: |
-          git fetch origin dev
-          git checkout dev
-          COMMIT_MSG="from ${{ env.branch_name }}"
-          if git log --pretty=format:"%s" origin/dev | grep -q "^$COMMIT_MSG$"; then
-            echo "duplicate=true" >> $GITHUB_OUTPUT
-          else
-            echo "duplicate=false" >> $GITHUB_OUTPUT
-          fi
-
-      # Trigger revert branch workflow if duplicate found
-      - name: Trigger revert workflow
-        if: steps.check_commit.outputs.duplicate == 'true'
-        uses: peter-evans/workflow-dispatch@v2
-        with:
-          token: ${{ secrets.PAT }}
-          repository: ${{ github.repository }}
-          workflow: manual-revert-workflow.yml
-          ref: dev
-          inputs:
-            branch_name: ${{ env.branch_name }}
-
-      # Wait for revert workflow to finish
-      - name: Wait for revert to complete
-        if: steps.check_commit.outputs.duplicate == 'true'
-        run: |
-          echo "Waiting for revert workflow to finish..."
-          sleep 30
-
-      # Retry squash merge after revert OR first attempt
-      - name: Squash merge PR into dev
-        id: merge
-        run: |
-          git fetch origin
-          git checkout dev
-          git pull origin dev
-
-          # Fetch PR branch
-          git fetch origin ${{ env.branch_name }}
-
-          set +e
-          git merge origin/${{ env.branch_name }} --squash
-          STATUS=$?
-          set -e
-
-          if [ $STATUS -ne 0 ]; then
-            echo "Merge conflict detected!"
-            echo "conflict=true" >> $GITHUB_OUTPUT
-            exit 0
-          fi
-
-          git commit -m "from ${{ env.branch_name }}"
-          git push origin dev
-          echo "conflict=false" >> $GITHUB_OUTPUT
-
-      # Fail workflow if merge conflict detected
-      - name: Fail on conflict
-        if: steps.merge.outputs.conflict == 'true'
-        run: |
-          echo "❌ Merge conflict detected while merging ${{ env.branch_name }} into dev."
-          echo "Please create a PR and resolve conflicts manually."
-          exit 1
-
-      # Comment on PR after successful merge
-      - name: Comment on PR
-        if: steps.merge.outputs.conflict == 'false'
-        run: |
-          gh pr comment ${{ github.event.inputs.pr_number }} --body "✅ Successfully squash merged into dev with commit: from ${{ env.branch_name }}"
-        env:
-          GH_TOKEN: ${{ secrets.PAT }}
diff --git a/.github/workflows/test_to_prod.yaml b/.github/workflows/test_to_prod.yaml
deleted file mode 100644
index 8987090..0000000
--- a/.github/workflows/test_to_prod.yaml
+++ /dev/null
@@ -1,110 +0,0 @@
-name: push-test-to-prod
-
-on:
-  workflow_run:
-    workflows: ["manual-revert-workflow"]
-    types:
-      - completed
-  workflow_dispatch:
-    inputs:
-      force_push:
-        description: "Force push test to prod (overwrites prod branch)"
-        required: false
-        default: "false"
-
-jobs:
-  push-to-prod:
-    runs-on: ubuntu-latest
-    if: github.event.workflow_run.conclusion == 'success'
-
-    steps:
-      # Checkout repository
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.PAT }}
-
-      # Configure Git
-      - name: Configure Git
-        run: |
-          git config --global user.name "GitHub Actions"
-          git config --global user.email "actions@github.com"
-
-      # Validate branches
-      - name: Validate branches
-        run: |
-          git fetch origin
-          if ! git ls-remote --heads origin test | grep -q test; then
-            echo "Error: test branch does not exist"
-            exit 1
-          fi
-          if ! git ls-remote --heads origin prod | grep -q prod; then
-            echo "Creating prod branch from test"
-            git checkout test
-            git push origin test:prod
-            exit 0
-          fi
-
-      # Push test to prod
-      - name: Push test to prod
-        id: push
-        run: |
-          git checkout prod
-          git fetch origin test
-          set +e
-          git merge origin/test --no-ff --no-edit
-          STATUS=$?
-          set -e
-          if [ $STATUS -ne 0 ]; then
-            echo "Merge conflict detected"
-            TIMESTAMP=$(date +%s)
-            CONFLICT_BRANCH="conflict/test-to-prod-$TIMESTAMP"
-            git checkout -b "$CONFLICT_BRANCH"
-            git push origin "$CONFLICT_BRANCH"
-            gh pr create \
-              --base prod \
-              --head "$CONFLICT_BRANCH" \
-              --title "Merge conflict: test to prod" \
-              --body "Automatic PR: Conflicts occurred while merging test into prod. Please resolve manually."
-            echo "conflict=true" >> $GITHUB_OUTPUT
-            exit 0
-          fi
-          git push origin prod
-          echo "conflict=false" >> $GITHUB_OUTPUT
-        env:
-          GH_TOKEN: ${{ secrets.PAT }}
-
-      # Force push if requested
-      - name: Force push test to prod
-        if: github.event.inputs.force_push == 'true' && steps.push.outputs.conflict == 'false'
-        run: |
-          git checkout test
-          git push origin test:prod --force
-          echo "Force pushed test to prod"
-        env:
-          GH_TOKEN: ${{ secrets.PAT }}
-
-      # Validate prod branch
-      - name: Validate prod branch
-        if: steps.push.outputs.conflict == 'false'
-        run: |
-          git fetch origin prod
-          git checkout prod
-          MERGE_COMMIT=$(git log --merges --pretty=%H -n 1)
-          if [ -z "$MERGE_COMMIT" ]; then
-            echo "No merge commit found in prod branch"
-            exit 1
-          fi
-          echo "Merge commit validated: $MERGE_COMMIT"
-
-      # Notify on merge conflict
-      - name: Notify on merge conflict
-        if: steps.push.outputs.conflict == 'true'
-        run: |
-          gh issue create \
-            --title "Merge Conflict: Test to Prod" \
-            --body "Merge conflict occurred while merging test into prod. Conflict branch created. Check PR for details." \
-            --repo ${{ github.repository }}
-        env:
-          GH_TOKEN: ${{ secrets.PAT }}
diff --git a/2.txt b/2.txt
index a3c4398..e69de29 100644
--- a/2.txt
+++ b/2.txt
@@ -1 +0,0 @@
-sdws
\ No newline at end of file
diff --git a/f11.txt b/f11.txt
index e69de29..55c5d2c 100644
--- a/f11.txt
+++ b/f11.txt
@@ -0,0 +1 @@
+test test normal commit
\ No newline at end of file
diff --git a/f13.txt b/f13.txt
index e69de29..08fe8fc 100644
--- a/f13.txt
+++ b/f13.txt
@@ -0,0 +1,3 @@
+
+# test commit 19
+# test commit 15

From 53f4b2f56dc2c75f043badd4d86eecad59dddb53 Mon Sep 17 00:00:00 2001
From: frocode <frocodeof@gmail.com>
Date: Fri, 22 Aug 2025 13:00:29 +0200
Subject: [PATCH 55/64] from f13

---
 2.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/2.txt b/2.txt
index e69de29..8b13789 100644
--- a/2.txt
+++ b/2.txt
@@ -0,0 +1 @@
+

From b1e64c55bc1c3f7adc94b1a1d309d6d3e6789030 Mon Sep 17 00:00:00 2001
From: MAAMAR HADDOUCHE <frocodeof@gmail.com>
Date: Fri, 22 Aug 2025 13:11:43 +0200
Subject: [PATCH 56/64] F13 (#40)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

✅ Successfully squash merged into dev with commit: from f13
---
 main.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/main.py b/main.py
index fb314e0..0eed882 100644
--- a/main.py
+++ b/main.py
@@ -36,3 +36,4 @@ def merge_sorted_arrays(arr1, arr2):
 # second commit f99
 # feature 7 added
 
+# added
\ No newline at end of file

From ce1351e407b15f39a0848141db128e5ae9e58514 Mon Sep 17 00:00:00 2001
From: MAAMAR HADDOUCHE <frocodeof@gmail.com>
Date: Fri, 22 Aug 2025 17:47:08 +0200
Subject: [PATCH 57/64] F13 (#41)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

✅ Successfully squash merged into dev with commit: from f13
---
 f13.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/f13.txt b/f13.txt
index 08fe8fc..0ec04ab 100644
--- a/f13.txt
+++ b/f13.txt
@@ -1,3 +1,4 @@
 
 # test commit 19
 # test commit 15
+# aded
\ No newline at end of file

From 9561fed7d995c9169c80ae15d4870b4868fe6896 Mon Sep 17 00:00:00 2001
From: MAAMAR HADDOUCHE <frocodeof@gmail.com>
Date: Fri, 22 Aug 2025 18:47:46 +0200
Subject: [PATCH 58/64] from f13
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

✅ Successfully squash merged into dev with commit: from f13
---
 f11.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/f11.txt b/f11.txt
index 55c5d2c..8ea3a12 100644
--- a/f11.txt
+++ b/f11.txt
@@ -1 +1,2 @@
-test test normal commit
\ No newline at end of file
+test test normal commit
+22
\ No newline at end of file

From b92fb8a945f0528ba71177bff3d6c3fcbc48e43c Mon Sep 17 00:00:00 2001
From: MAAMAR HADDOUCHE <frocodeof@gmail.com>
Date: Fri, 22 Aug 2025 19:07:35 +0200
Subject: [PATCH 59/64] from f13
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

✅ Successfully squash merged into dev with commit: from f13
---
 f11.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/f11.txt b/f11.txt
index 8ea3a12..e69de29 100644
--- a/f11.txt
+++ b/f11.txt
@@ -1,2 +0,0 @@
-test test normal commit
-22
\ No newline at end of file

From 2b2f2ea58ae31ef07389aac1a236162bfefcadae Mon Sep 17 00:00:00 2001
From: MAAMAR HADDOUCHE <frocodeof@gmail.com>
Date: Fri, 22 Aug 2025 19:29:47 +0200
Subject: [PATCH 60/64] F13 (#44)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

✅ Successfully squash merged into dev with commit: from f13 --subject 'from f13'
---
 f13.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/f13.txt b/f13.txt
index 0ec04ab..df6f9bb 100644
--- a/f13.txt
+++ b/f13.txt
@@ -1,4 +1,5 @@
 
 # test commit 19
 # test commit 15
-# aded
\ No newline at end of file
+# aded
+de
\ No newline at end of file

From 45bec62b10b52fe448bd0d8e9f2356ae8d35a54a Mon Sep 17 00:00:00 2001
From: MAAMAR HADDOUCHE <frocodeof@gmail.com>
Date: Thu, 18 Sep 2025 09:50:34 +0200
Subject: [PATCH 61/64] we (#46)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

✅ Successfully squash merged into dev with commit: from f23 --subject 'from f23'
---
 f13.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/f13.txt b/f13.txt
index df6f9bb..9d26efd 100644
--- a/f13.txt
+++ b/f13.txt
@@ -2,4 +2,5 @@
 # test commit 19
 # test commit 15
 # aded
-de
\ No newline at end of file
+de
+here from f23
\ No newline at end of file

From 3b3c42aedee7ed62e5340a3362df58be505ec730 Mon Sep 17 00:00:00 2001
From: MAAMAR HADDOUCHE <frocodeof@gmail.com>
Date: Thu, 18 Sep 2025 11:42:46 +0200
Subject: [PATCH 62/64] from feature/30
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

✅ Successfully squash merged into dev from feature/30
---
 30.txt | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 30.txt

diff --git a/30.txt b/30.txt
new file mode 100644
index 0000000..e69de29

From 63914028cd321e8a3157fd9950b6761576eb7259 Mon Sep 17 00:00:00 2001
From: MAAMAR HADDOUCHE <frocodeof@gmail.com>
Date: Thu, 18 Sep 2025 11:51:09 +0200
Subject: [PATCH 63/64] from feature/32
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

✅ Successfully squash merged into dev from feature/32
---
 30.txt | 1 +
 32.txt | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 32.txt

diff --git a/30.txt b/30.txt
index e69de29..d69dd4e 100644
--- a/30.txt
+++ b/30.txt
@@ -0,0 +1 @@
+line added from ft 32
\ No newline at end of file
diff --git a/32.txt b/32.txt
new file mode 100644
index 0000000..31422dc
--- /dev/null
+++ b/32.txt
@@ -0,0 +1 @@
+first line on first commit from 32
\ No newline at end of file

From cc6c47b14c36dac299d6ac38cf484dcc3bbb6510 Mon Sep 17 00:00:00 2001
From: frocode <frocodeof@gmail.com>
Date: Thu, 18 Sep 2025 18:03:33 +0200
Subject: [PATCH 64/64] dede

---
 f13.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/f13.txt b/f13.txt
index 9d26efd..5f0ec04 100644
--- a/f13.txt
+++ b/f13.txt
@@ -3,4 +3,4 @@
 # test commit 15
 # aded
 de
-here from f23
\ No newline at end of file
+here from f234
\ No newline at end of file