Adding a first claude slash command for syncing downstream with upstream

Signed-off-by: Matthias Wessendorf <[email protected]>

Author: matzew

.claude/commands/sync-downstream.md

@@ -0,0 +1,87 @@
+---
+description: Sync downstream repo with upstream main, preserving downstream-specific files
+---
+
+You are helping sync a downstream repository with upstream changes while preserving downstream-specific configuration files.
+
+# Workflow Overview
+
+1. **Pre-flight checks**: Verify clean working directory, check remotes exist
+2. **Fetch and merge**: Create sync branch from upstream/main, merge with `-s ours` strategy
+3. **Restore downstream files**: Cherry-pick specific downstream files from downstream/main
+4. **Update dependencies**: Run `go mod tidy && go mod vendor`
+5. **Commit**: Single commit with message "sync: merge upstream main with downstream config"
+6. **Summary**: Show what changed and next steps
+
+# Downstream Files to Preserve
+
+Read the list of files to preserve from `.downstream-preserve` if it exists, otherwise use this default list:
+- .ci-operator.yaml
+- .snyk
+- .tekton/
+- Dockerfile.ci
+- Dockerfile.ocp
+- Makefile-ocp.mk
+- OWNERS
+- mcp_config.toml
+- renovate.json
+
+# Implementation Steps
+
+## Step 1: Pre-flight Checks
+- Check if working directory is clean (`git status --porcelain`)
+  - If not clean, warn user and ask if they want to continue
+- Verify `upstream` and `downstream` remotes exist
+  - If missing, show error and list available remotes
+- Check if `sync-downstream` branch already exists
+  - If it exists, ask user if they want to delete and recreate
+
+## Step 2: Execute Sync
+Run these git commands:
+```bash
+git fetch downstream
+git fetch upstream
+git checkout -b sync-downstream upstream/main
+git merge -s ours --no-commit downstream/main
+```
+
+## Step 3: Restore Downstream Files
+For each file/folder in the preserve list:
+```bash
+git checkout downstream/main -- <file>
+```
+
+## Step 4: Update Dependencies
+```bash
+go mod tidy
+go mod vendor
+git add vendor/
+```
+
+## Step 5: Commit
+```bash
+git commit -am "sync: merge upstream main with downstream config"
+```
+
+## Step 6: Summary and Next Steps
+Show:
+- Commit SHA and message
+- Summary of changes (`git diff --stat downstream/main..HEAD`)
+- Suggested next steps:
+  - Run tests
+  - Push branch: `git push origin sync-downstream`
+  - Create PR: `gh pr create --base downstream/main`
+
+# Error Handling
+
+- If any step fails, stop and show the error
+- Preserve the working state for manual intervention
+- Suggest rollback command: `git checkout <previous-branch> && git branch -D sync-downstream`
+
+# Safety Features
+
+- Show diff summary before committing
+- Ask for confirmation before proceeding with commit
+- Provide dry-run output at each step
+
+Execute this workflow now. Be cautious and ask for confirmation at critical steps.

.downstream-preserve

@@ -0,0 +1,11 @@
+# Downstream files/folders to preserve during upstream sync
+# One entry per line, supports directories with trailing /
+.ci-operator.yaml
+.snyk
+.tekton/
+Dockerfile.ci
+Dockerfile.ocp
+Makefile-ocp.mk
+OWNERS
+mcp_config.toml
+renovate.json