Sync Upstream is a skill designed for developers who need to ensure their session branches are aligned with the latest changes from the upstream repository. This skill facilitates the process of rebasing your current branch onto the latest version of the origin, which is particularly useful when the upstream has undergone significant updates. By using this skill, developers can easily adapt their ongoing work to fit the new upstream context while preserving the integrity of their session changes.

The workflow begins with a check for uncommitted changes, which must be committed before proceeding. The skill then automates the fetching of the latest upstream changes and rebases the current session branch onto the specified base branch, typically main. This ensures that the session branch is grounded in the most recent version of the codebase, minimizing the risk of conflicts and integration issues.

In the event of conflicts during the rebase, the skill enforces a strict policy where upstream changes take precedence. Developers are instructed to adapt their session work to align with the new upstream logic without altering it. This approach not only helps maintain the integrity of the upstream repository but also encourages developers to think critically about how their changes fit into the larger codebase. After resolving conflicts, the skill guides users through the process of continuing the rebase and validating the final result to ensure that the session objectives are still met.

Sync Upstream is ideal for teams working in collaborative environments where the upstream repository is frequently updated. It streamlines the process of keeping session branches current, reducing the time spent on manual conflict resolution and integration tasks.