Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
41bd54f
updea
FroCode Jul 27, 2025
7ee12fc
f5_feature_edit
FroCode Jul 27, 2025
7b7a668
Merge pull request #4 from FroCode/f5
FroCode Jul 27, 2025
f3d1811
added 5 v2
FroCode Jul 27, 2025
b65a1a2
Merge branch 'f5' into dev
FroCode Jul 27, 2025
6be0b7e
Revert "Merge branch 'f5' into dev"
actions-user Jul 27, 2025
c6c88ec
Reapply "Merge branch 'f5' into dev"
actions-user Jul 27, 2025
d38520f
add
FroCode Jul 27, 2025
d1c53d6
Merge branch 'dev' into f6
FroCode Jul 27, 2025
7034d3c
Merge pull request #8 from FroCode/f6
FroCode Jul 27, 2025
b937364
Revert "Merge pull request #8 from FroCode/f6"
invalid-email-address Jul 27, 2025
dd11e8d
Reapply "Merge pull request #8 from FroCode/f6"
actions-user Jul 28, 2025
178b33d
added
FroCode Jul 28, 2025
b5436ed
update
FroCode Jul 28, 2025
e0d3e34
Merge branch 'dev' into f7
FroCode Jul 28, 2025
32b42e9
Merge pull request #9 from FroCode/f7
FroCode Jul 28, 2025
1a5eeb7
added
FroCode Jul 28, 2025
ff59c8d
Merge branch 'dev' into f9
FroCode Jul 28, 2025
9b47b2b
Merge pull request #10 from FroCode/f9
FroCode Jul 28, 2025
347bde7
f12.txt (#12)
FroCode Jul 29, 2025
430b4dc
normal commit + publish branch (#13)
FroCode Jul 29, 2025
78115be
Revert commit 430b4dc from f11
actions-user Jul 29, 2025
a1c67a3
Revert commit 78115be from f13
actions-user Jul 29, 2025
d8ac81e
++
FroCode Jul 31, 2025
b8a7a75
Merge pull request #14 from FroCode:f15
FroCode Jul 31, 2025
95c987e
ad (#15)
FroCode Jul 31, 2025
faf6093
F13 (#11)
FroCode Jul 31, 2025
f095fca
F15 (#16)
FroCode Jul 31, 2025
a09c099
Revert commit f095fca from f15
actions-user Jul 31, 2025
6b9be6b
Revert commit a09c099 from f15
actions-user Jul 31, 2025
85b65ea
F15 (#18)
FroCode Jul 31, 2025
7bf7c6e
F15 (#19)
FroCode Jul 31, 2025
ea6d604
Revert squash commit 7bf7c6e593a7e8fd6f14617c0f5c44b3f10ca504 (from b…
actions-user Jul 31, 2025
f64d08e
Revert squash commit 85b65eab2aa10e03aaac52a31797b1528b53de5f (from b…
actions-user Jul 31, 2025
9a6842c
Revert squash commit 6b9be6baaa898df8205a308a8e078ed03116a6b4 (from b…
actions-user Jul 31, 2025
a8ede41
Revert squash commit a09c099c8f5a747763631b3209d19a0ed06d2267 (from b…
actions-user Jul 31, 2025
3d9c57f
Conflict revert for d1c53d6d592f4b82228bd2b0df9bac233e126f2b from f6 …
FroCode Jul 31, 2025
e286501
Conflict revert for c6c88ec2b4e2835e1307ec3820b64684480be559 from f6 …
FroCode Jul 31, 2025
2409ac6
Conflict revert for 7034d3c4754ec484377805752df648c21fae691d from f6 …
FroCode Jul 31, 2025
7184cf4
Revert squash commit 2409ac6dd8584911935b7d79ff5e57a765d16ad8 (from f6)
actions-user Jul 31, 2025
a9dad16
Revert squash commit e28650141ef5bf697e5c597135b1b3f0f81825f9 (from f6)
actions-user Jul 31, 2025
cb77abf
Revert squash commit 3d9c57f89fec9837f23d20a49239a846b6133d06 (from f6)
actions-user Jul 31, 2025
69210d6
Revert squash commit 347bde7df867956834b58793b6dbb98e95dfd864 (from f12)
actions-user Jul 31, 2025
9bd2fc5
Revert squash commit a8ede41c0e35244f17c8a3cf94f7a88d6830dfe6 (from f15)
actions-user Jul 31, 2025
605132f
Revert squash commit 9a6842cb00ae589dbf6289e56615c4276338d49c (from f15)
actions-user Jul 31, 2025
b4d4561
Revert squash commit f64d08ecf78877901d1e25326692a3565091aa21 (from f15)
actions-user Jul 31, 2025
0a51f8a
Revert squash commit ea6d60400217d22d4e0c3bbf64e34c42cc5d7879 (from f15)
actions-user Jul 31, 2025
8e15f9a
Revert squash commit 0a51f8a7cb811d5bc4fca4f28faadafeb9564267 (from f15)
actions-user Jul 31, 2025
220ade6
Revert squash commit b4d4561b9e865006cce347e762c7b6ccda7c404d (from f15)
actions-user Jul 31, 2025
baae914
Revert squash commit 605132f6da368eb7ac11681226e701e70bfa0163 (from f15)
actions-user Jul 31, 2025
b367c23
Revert squash commit 9bd2fc55139974627e40c13cf6801abca5c1d96b (from f15)
actions-user Jul 31, 2025
d1ac490
Revert "Revert squash commit 9bd2fc55139974627e40c13cf6801abca5c1d96b…
actions-user Jul 31, 2025
0805058
F15 (#33)
FroCode Jul 31, 2025
05f30be
F15 (#34)
FroCode Jul 31, 2025
be8d252
Revert "F15 (#34)"
actions-user Jul 31, 2025
3adbcc7
F15 (#35)
FroCode Aug 3, 2025
18dfa3e
F15 (#36)
FroCode Aug 3, 2025
db3d78c
Revert "F15 (#36)"
actions-user Aug 3, 2025
32fe085
from f13
actions-user Aug 22, 2025
3ba070d
F13 (#37)
FroCode Aug 22, 2025
6483cfb
Revert "from f13"
actions-user Aug 22, 2025
3950f35
from f13
actions-user Aug 22, 2025
458cc47
Revert "from f13"
actions-user Aug 22, 2025
53f4b2f
from f13
FroCode Aug 22, 2025
b1e64c5
F13 (#40)
FroCode Aug 22, 2025
ce1351e
F13 (#41)
FroCode Aug 22, 2025
9561fed
from f13
FroCode Aug 22, 2025
b92fb8a
from f13
FroCode Aug 22, 2025
2b2f2ea
F13 (#44)
FroCode Aug 22, 2025
45bec62
we (#46)
FroCode Sep 18, 2025
3b3c42a
from feature/30
FroCode Sep 18, 2025
6391402
from feature/32
FroCode Sep 18, 2025
cc6c47b
dede
FroCode Sep 18, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 48 additions & 18 deletions .github/workflows/summary.yml
Original file line number Diff line number Diff line change
@@ -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"
- 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"
1 change: 1 addition & 0 deletions 1.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
14
1 change: 1 addition & 0 deletions 2.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

1 change: 1 addition & 0 deletions 30.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
line added from ft 32
1 change: 1 addition & 0 deletions 32.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
first line on first commit from 32
Empty file added f11.txt
Empty file.
6 changes: 6 additions & 0 deletions f13.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@

# test commit 19
# test commit 15
# aded
de
here from f234
9 changes: 8 additions & 1 deletion main.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,11 @@ 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
# This is an f5 feature edit
# this feature has been added from f6

# second commit f5
# second commit f99
# feature 7 added

# added
Loading