From d8c79e8c0f476266a3f4ad2252e23bc57690bdc5 Mon Sep 17 00:00:00 2001 From: Bryce Meyer Date: Wed, 4 Oct 2023 23:49:05 +0200 Subject: [PATCH 1/6] added rebase action --- .github/workflows/rebase-pull-requests.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .github/workflows/rebase-pull-requests.yml diff --git a/.github/workflows/rebase-pull-requests.yml b/.github/workflows/rebase-pull-requests.yml new file mode 100644 index 000000000..7100afd4c --- /dev/null +++ b/.github/workflows/rebase-pull-requests.yml @@ -0,0 +1,9 @@ +name: Rebase Pull Requests +on: + push: + branches: [main] +jobs: + rebase: + runs-on: ubuntu-latest + steps: + - uses: linhbn123/rebase-pull-requests@v1.0.1 \ No newline at end of file From 0cc2f820f8833506eaccc170c470f2a0f27c87d9 Mon Sep 17 00:00:00 2001 From: Bryce Meyer Date: Wed, 4 Oct 2023 23:53:07 +0200 Subject: [PATCH 2/6] added temp file --- temp | 1 + 1 file changed, 1 insertion(+) create mode 100644 temp diff --git a/temp b/temp new file mode 100644 index 000000000..ce0136250 --- /dev/null +++ b/temp @@ -0,0 +1 @@ +hello From 178717ce41b89a1ad84b780aa783e7e1e37cd886 Mon Sep 17 00:00:00 2001 From: Bryce Meyer Date: Wed, 4 Oct 2023 23:54:54 +0200 Subject: [PATCH 3/6] added temp file --- temp | 1 + 1 file changed, 1 insertion(+) create mode 100644 temp diff --git a/temp b/temp new file mode 100644 index 000000000..b023018ca --- /dev/null +++ b/temp @@ -0,0 +1 @@ +bye From a0a32926ebf0bb2c58aba9de29d9c3b23290a0db Mon Sep 17 00:00:00 2001 From: Bryce Meyer Date: Wed, 4 Oct 2023 23:56:11 +0200 Subject: [PATCH 4/6] Revert "added temp file" This reverts commit 178717ce41b89a1ad84b780aa783e7e1e37cd886. --- temp | 1 - 1 file changed, 1 deletion(-) delete mode 100644 temp diff --git a/temp b/temp deleted file mode 100644 index b023018ca..000000000 --- a/temp +++ /dev/null @@ -1 +0,0 @@ -bye From 8bce500a171382d04447c908d5e70158f0470146 Mon Sep 17 00:00:00 2001 From: Bryce Meyer Date: Sat, 14 Oct 2023 22:07:06 +0200 Subject: [PATCH 5/6] revised pull request --- .github/workflows/rebase-pull-requests.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rebase-pull-requests.yml b/.github/workflows/rebase-pull-requests.yml index 7100afd4c..24c4c122c 100644 --- a/.github/workflows/rebase-pull-requests.yml +++ b/.github/workflows/rebase-pull-requests.yml @@ -1,4 +1,4 @@ -name: Rebase Pull Requests +name: Rebase on: push: branches: [main] @@ -6,4 +6,8 @@ jobs: rebase: runs-on: ubuntu-latest steps: - - uses: linhbn123/rebase-pull-requests@v1.0.1 \ No newline at end of file + - uses: peter-evans/rebase@v2 + with: + base: main + exclude-labels: | + no-rebase \ No newline at end of file From 0bd9d8ccdaa4aa1f50000392f9889146d391fbc8 Mon Sep 17 00:00:00 2001 From: Bryce Meyer Date: Sat, 14 Oct 2023 22:28:15 +0200 Subject: [PATCH 6/6] updated temp file --- temp | 1 + 1 file changed, 1 insertion(+) diff --git a/temp b/temp index ce0136250..c27bdb4dd 100644 --- a/temp +++ b/temp @@ -1 +1,2 @@ hello +again