Change naming convention: rebase to merge

Author: akucharska

.github/actions/rebase/action.yml

@@ -1,14 +1,14 @@
-name: 'Rebase'
-description: 'Action for rebasing to the main branch'
+name: 'Merge'
+description: 'Action for merging to the main branch'
 
 runs:
   using: 'composite'
   steps:
     # Setup identity to avoid errors when git is trying to rebase without identity set
     - name: Setup git identity
       run: |
-        git config --global user.email "rebase@action.com"
-        git config --global user.name "Rebase Action"
+        git config --global user.email "merge@action.com"
+        git config --global user.name "Merge Action"
       shell: bash
 
     # Update origin/main branch locally to cover case when repo is not fully cloned

.github/workflows/pull-integration-cluster-k3d.yml

@@ -22,8 +22,8 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Rebase
-        uses: ./.github/actions/rebase
+      - name: Merge
+        uses: ./.github/actions/merge
       - name: Create Single Cluster
         uses: AbsaOSS/k3d-action@4e8b3239042be1dc0aed6c5eb80c13b18200fc79 #v2.4.0
         with:

.github/workflows/pull-integration-namespace-k3d.yml

@@ -22,8 +22,8 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Rebase
-        uses: ./.github/actions/rebase
+      - name: Merge
+        uses: ./.github/actions/merge
       - name: Create Single Cluster
         uses: AbsaOSS/k3d-action@4e8b3239042be1dc0aed6c5eb80c13b18200fc79 #v2.4.0
         with:

.github/workflows/pull-kyma-integration-tests.yml

@@ -23,8 +23,8 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Rebase
-        uses: ./.github/actions/rebase
+      - name: Merge
+        uses: ./.github/actions/merge
       - name: Install k3d
         env:
           K3D_URL: https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh

.github/workflows/pull-lighthouse.yml

@@ -21,8 +21,8 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Rebase
-        uses: ./.github/actions/rebase
+      - name: Merge
+        uses: ./.github/actions/merge
       - name: Create Single Cluster
         uses: AbsaOSS/k3d-action@4e8b3239042be1dc0aed6c5eb80c13b18200fc79 #v2.4.0
         with:

.github/workflows/pull-smoke-test-prod.yml

@@ -23,8 +23,8 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Rebase
-        uses: ./.github/actions/rebase
+      - name: Merge
+        uses: ./.github/actions/merge
       - name: Install k3d
         env:
           K3D_URL: https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh

.github/workflows/pull-smoke-test-stage.yml

@@ -23,8 +23,8 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Rebase
-        uses: ./.github/actions/rebase
+      - name: Merge
+        uses: ./.github/actions/merge
       - name: Install k3d
         env:
           K3D_URL: https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh

.github/workflows/pull-unit-tests.yml

@@ -23,8 +23,8 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Rebase
-        uses: ./.github/actions/rebase
+      - name: Merge
+        uses: ./.github/actions/merge
       - uses: actions/setup-node@v4
         with:
           node-version: 20