564 B
564 B
description
| description |
|---|
| Sync branch with main/master and resolve conflicts |
Sync current branch with main branch:
- Fetch latest changes from remote
- Identify the main branch (main or master)
- Ensure working directory is clean (fail if uncommitted changes)
- Rebase current branch on latest main
- If conflicts occur:
- List all conflicting files
- Ask user how to proceed (abort, resolve manually, or auto-resolve if simple)
- Run linters and fix any issues introduced
- Report sync status
IMPORTANT: Never force-push without explicit confirmation.