Sync Main
Workflow
-
Summarize current git status and confirm whether a commit is needed.
-
If already in conflict, skip merge/rebase and resolve conflicts directly.
-
Fetch origin and merge or rebase from origin/main.
-
Resolve conflicts, preserving branch intent and upstream structure.
-
Summarize what changed and note that pushing is left to the user.