rebase

To rebase safely, the Skill auto-stashes your uncommitted changes before rebasing your current branch onto the latest target branch, then restores the stash afterward to preserve your local work.

The safest way to update a feature branch is using a fast-forward only rebase strategy, which applies upstream updates cleanly and maintains a linear history without forcing unnecessary merge commits.

When rebasing a feature branch causes conflicts, the Skill pauses the operation, captures conflict metadata for auditing, and provides clear guidance on how to resolve the issues before continuing.

Yes, you can rebase onto a different target branch by specifying it as an option, allowing you to update your current feature branch against develop or any other upstream branch you choose.

Rebasing does not cause data loss here because the process automatically stashes uncommitted changes before applying the rebase operation, ensuring your local work is preserved and restored.

A fast-forward only strategy for branch management ensures a linear history by applying upstream updates directly, avoiding complex merge commits and keeping the version control log clean and straightforward.