kyma-project · mrCherry97 · Feb 6, 2025 · Jan 29, 2025 · Jan 29, 2025 · Jan 29, 2025
diff --git a/.github/workflows/pr-rebase.yml b/.github/workflows/pr-rebase.yml
@@ -0,0 +1,11 @@
+name: Rebase Pull Requests
+on:
+  push:
+    branches: [main, gh-actions-rebase]
+jobs:
+  rebase:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: peter-evans/rebase@v3
+        with:
+          base: main
diff --git a/README.md b/README.md
@@ -329,3 +329,5 @@ See the [Code of Conduct](CODE_OF_CONDUCT.md) document.
 ## Licensing
 
 See the [license](./LICENSE) file.
+
+test
diff --git a/docs/contributor/testing-strategy.md b/docs/contributor/testing-strategy.md
@@ -15,6 +15,7 @@ Each pull request (PR) to the repository triggers CI/CD jobs that verify the Bus
 - `PR Unit and Component Tests / run-unit-and-component-test` - Performs unit and component tests of Busola.
 - `Lint Markdown Links PR / markdown-link-check` - Checks links in documentation.
 - `CodeQL / Analyze (javascript)` - Code quality static code check.
+- `Rebase Pull Requests` - Makes sure the PR branch is up to date with `main` branch.
 
 After the pull request is merged, the following CI/CD jobs are executed:
Original file line number	Diff line number	Diff line change
Expand Up		@@ -329,3 +329,5 @@ See the [Code of Conduct](CODE_OF_CONDUCT.md) document.
		## Licensing

		See the [license](./LICENSE) file.

		test
akucharska marked this conversation as resolved. Show resolved Hide resolved