branch-sync

To sync your upgrade working branch, run the 'sync' command to initiate a manual merge or rebase with the source branch. This synchronizes the working branch, resolves conflicts using upgrade context, validates with a build, and rolls back automatically on failure.

You need to synchronize an upgrade working branch when it diverges from the source branch, typically main, to ensure a smooth merge-back process at the end of an upgrade. Branch sync detects divergence and resolves conflicts to maintain branch integrity.

Yes, you can automatically trigger a branch sync between tasks by specifying it in the scenario instructions. This automated sync synchronizes the working branch using merge or rebase, resolves conflicts using upgrade context, and validates the build automatically.

The best way to handle merge conflicts during a branch upgrade is to use a sync workflow that automatically resolves conflicts using upgrade context. If conflict resolution fails, the system rolls back the changes to maintain branch stability.

Yes, branch sync validates the working branch with a build after synchronizing to ensure integrity. If the build validation fails, the system automatically rolls back the branch changes to prevent breaking the source branch.

You can choose either merge or rebase to keep your upgrade branch updated based on your preference. Both methods detect divergence, resolve conflicts using upgrade context, validate with a build, and roll back on failure to ensure a smooth merge-back process.