updating the sync-main command further

main
Christopher Maujean 2 months ago
parent 0f61556d68
commit 4e773aaa30
  1. 15
      .claude/commands/sync-main.md

@ -1,10 +1,17 @@
Pull down the latest changes from github.
Switch to preview branch. Ensure preview has any new changes from main. If there are conflicts ask the user in a simple way if the changes should be merged or discarded. Sync the preview branch with the latest changes from main branch on GitHub.
The user should always be working from the preview branch. **Workflow:**
1. Stash any uncommitted changes
2. Switch to main branch and pull latest changes
3. Switch to preview branch and pull latest changes
4. Merge main into preview (handle conflicts if needed)
5. Pop stashed changes back
This command is being called by someone who does not know what git is. Your job is to do the process on their behalf. **Conflict handling:** If there are merge conflicts, ask the user in simple terms whether to keep the new changes from main or keep the existing preview changes.
**End state:** User is on preview branch with latest main changes merged in and their work restored.
This command is for users who don't need to know git details - handle everything automatically.
Optional context: #$ARGUMENTS Optional context: #$ARGUMENTS

Loading…
Cancel
Save