Revert merge.yml changes — remove feature branch trigger and non-main tag logic

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Signed-off-by: bladata1990 <balakrishnan.r@atlan.com>

Author: bladata1990

.github/workflows/merge.yml

@@ -6,7 +6,7 @@ permissions:
 
 on:
   push:
-    branches: [main, feature/rab-complex-type-nested-columns]
+    branches: [main]
   workflow_dispatch:
     inputs:
       branch:
@@ -230,13 +230,9 @@ jobs:
             # For manual runs, use version and branch name (sanitized)
             BRANCH_NAME=$(echo "${{ github.event.inputs.branch }}" | sed 's/[^a-zA-Z0-9._-]/-/g')
             echo "tags=ghcr.io/atlanhq/atlan-java:${{ needs.merge-build.outputs.version }}-${BRANCH_NAME}" >> $GITHUB_OUTPUT
-          elif [ "${{ github.ref }}" = "refs/heads/main" ]; then
+          else
             # For main branch pushes, use version and latest
             echo "tags=ghcr.io/atlanhq/atlan-java:${{ needs.merge-build.outputs.version }},ghcr.io/atlanhq/atlan-java:latest" >> $GITHUB_OUTPUT
-          else
-            # For non-main branch pushes, use version and branch name
-            BRANCH_NAME=$(echo "${{ github.ref_name }}" | sed 's/[^a-zA-Z0-9._-]/-/g')
-            echo "tags=ghcr.io/atlanhq/atlan-java:${{ needs.merge-build.outputs.version }}-${BRANCH_NAME}" >> $GITHUB_OUTPUT
           fi
       - name: Build and publish container image
         uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294  # v7.0.0
@@ -275,4 +271,4 @@ jobs:
     with:
       package_name: ${{ matrix.package_name }}
       version: ${{ needs.merge-build.outputs.version }}
-      branch: ${{ github.event.inputs.branch || (github.ref != 'refs/heads/main' && github.ref_name) || '' }}
+      branch: ${{ github.event.inputs.branch || '' }}