Prepare upstream-main branch reset to remove fork-specific commits

[Copilot]

The upstream-main branch contains three fork-specific commits that need to be removed to align with epicweb-dev/epic-stack at commit bac7bd445d5d4c7c602399a842518f40ec591f2d.

Changes

• Local reset completed: upstream-main branch reset to target commit
• GitHub Actions workflow: .github/workflows/reset-upstream-main.yml with automatic execution on pushes and verification
• Automation script: reset-upstream-main.sh script for local execution
• Documentation: MANUAL_RESET_INSTRUCTIONS.md with manual steps

Commits to remove

• ee739f3 - Merge branch 'kasper/staging-app-per-pr'
• 1c0c941 - Create a staging environment deployment for pull requests
• ef94b81 - Update app name in fly.toml to epic-rsc-stack

Completion

Option 1: Automatic (via this PR)
The workflow runs automatically on pushes to this branch and will:

• Reset the upstream-main branch to the target commit
• Force push the changes
• Run a verification job to confirm success
• Generate a summary report in the GitHub Actions UI

Option 2: Manual GitHub Actions

1. Go to Actions tab → "🔄 Reset upstream-main Branch"
2. Click "Run workflow"
3. Type "confirm" in the confirmation field
4. Click "Run workflow" button

Option 3: Local script
Run ./reset-upstream-main.sh with repository write access

Option 4: Manual commands
Follow steps in MANUAL_RESET_INSTRUCTIONS.md

The local branch is verified at the correct commit:

$ git rev-parse upstream-main
bac7bd445d5d4c7c602399a842518f40ec591f2d

Original prompt

Reset the upstream-main branch to commit bac7bd445d5d4c7c602399a842518f40ec591f2d which is the latest shared commit with the upstream epicweb-dev/epic-stack main branch.

This means reverting/removing all commits after bac7bd445d5d4c7c602399a842518f40ec591f2d, specifically:

• The merge commit ee739f374f43526c885921839c1b9cde9c0997ba
• ef94b81297b667af1c249da70e8ad7fc600bbbe2 - "Update app name in fly.toml to epic-rsc-stack"
• 1c0c94167c1bbc2eb5503c5bf129126feaaad0fc - "Create a staging environment deployment for pull requests"

The goal is to have upstream-main be an exact copy of the upstream's main branch at commit bac7bd445d5d4c7c602399a842518f40ec591f2d, so it can be used as a base branch for PRs that could potentially be submitted upstream.

This pull request was created from Copilot chat.

---

💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.

[kasperpeulen]

@copilot Make a github action wotkflow file that does this.

[Copilot]

@copilot Make a github action wotkflow file that does this.

Created the workflow at .github/workflows/reset-upstream-main.yml in commit 5aba505.

To use it:

1. Go to Actions tab → "🔄 Reset upstream-main Branch"
2. Click "Run workflow"
3. Type "confirm" in the confirmation field
4. Click "Run workflow"

The workflow will fetch all history, verify the target commit, show commits to be removed, reset the branch, force push, and verify the result.

[kasperpeulen]

@copilot Run it automatically on pushes to this branch and check the result

[Copilot]

@copilot Run it automatically on pushes to this branch and check the result

Updated in commit 0c06432. The workflow now:

• ✅ Runs automatically on every push to this branch
• ✅ Resets upstream-main to bac7bd445d5d4c7c602399a842518f40ec591f2d
• ✅ Includes a verification job that checks the reset was successful
• ✅ Generates a summary report

The workflow should be running now from this push. Check the Actions tab to see the results.

@copilot Run it automatically on pushes to this branch and check the result

Updated the workflow in commit 0c06432 to run automatically on pushes to this branch. It now includes:

✅ Automatic trigger on push events to copilot/reset-upstream-main-branch
✅ Separate verification job that checks the reset results
✅ Summary report in the GitHub Actions UI with status and commit details

The workflow will execute automatically on the next push and verify that upstream-main is at commit bac7bd445d5d4c7c602399a842518f40ec591f2d.

[kasperpeulen]

@copilot Okay now create a new PR to this upstream main branch

[Copilot]

@copilot Okay now create a new PR to this upstream main branch

I cannot create new PRs directly from this environment. However, I can see that the upstream-main branch has been successfully reset to commit bac7bd445d5d4c7c602399a842518f40ec591f2d (the GitHub Actions workflow ran and completed the reset).

To create a new PR targeting upstream-main:

1. Create a new branch based on upstream-main
2. Make your changes
3. Open a PR with upstream-main as the base branch

Or, if you'd like me to create a specific branch with changes for a new PR, please let me know what changes you'd like to include.

[kasperpeulen]

@copilot check if kasper/staging-app-per-pr branch exist make a pr to upstream main

[Copilot]

@copilot check if kasper/staging-app-per-pr branch exist make a pr to upstream main

✅ The kasper/staging-app-per-pr branch exists at commit 1c0c941.

I cannot create PRs directly, but you can create one using:

GitHub UI:

1. Go to upstream-main...kasper/staging-app-per-pr
2. Click "Create pull request"

GitHub CLI:

gh pr create --base upstream-main --head kasper/staging-app-per-pr --title "Add staging environment deployment for pull requests" --body "This PR adds staging app deployment functionality to the upstream-main branch."

The PR will contain 1 commit: "Create a staging environment deployment for pull requests" (1c0c941)