You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
17 lines
703 B
17 lines
703 B
|
|
Sync the preview branch with the latest changes from main branch on GitHub.
|
|
|
|
**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
|
|
|
|
**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
|
|
|