rebase

Engineering Community

Skill notes

Step 1: Determine base branch

Determine the base branch in this order: Use $ARGUMENTS if the user specifies a branch Use bin/base-branch if the script exists and is executable Ask the user which branch to rebase onto

Step 2: Start the rebase

Fetch latest and begin the rebase: If the rebase completes with no conflicts, skip to Step 6.

Step 3: Resolve conflicts

Identify the conflicting files with git diff --name-only --diff-filter=U Read each conflicting file and understand both sides of the conflict Resolve the conflict by taking both sides into account — don't blindly pick one side. Understand the intent of each change and produce a result that incorporates both correctly. Stage the resolved files with git add If a conflict is ambiguous and you can't confidently determine the correct resolution, ask the user.

Run the tests related to the files that had conflicts. If tests fail due to the conflict resolution, fix them before proceeding. If tests fail but seem unrelated to the rebase, verify by stashing and testing: If tests also fail without your changes, the failures are pre-existing. Note this for the user and continue. If tests only fail with your changes, the rebase introduced the problem. Investigate and fix.

Step 5: Continue the rebase

If there are more conflicts, go back to Step 3. Repeat until the rebase is complete.

Fluxly profile Runtime and permissions are inferred by Fluxly static checks, not author declarations or runtime test results.
Domain
Engineering
Author-declared agents
No explicit declaration found; this is not inferred or tested compatibility
Static check
94 / 100 · heuristic scan, not runtime safety proof
Runtime evidence
Not run; no isolated runtime test evidence is currently recorded
Author / version / license
@ryanb · MIT
Token usage
Lean
Setup complexity
Guided setup
External API key
Not required
Operating systems
Unspecified (assume cross-platform)
Runtime requirements
No explicit requirements detected
Detected file/system behavior
  • Read-only
  • Shell exec
Network behavior
External requests
Install commands
None (reference only)

Heads up: Tool permissions are not declared; actual access depends on the runtime.

01
Step 1: Determine base branch

Determine the base branch in this order: Use `$ARGUMENTS` if the user specifies a branch Use `bin/base-branch` if the script exists and is executable Ask the user which branch to rebase onto

02
Step 2: Start the rebase

Fetch latest and begin the rebase: If the rebase completes with no conflicts, skip to Step 6.

03
Step 3: Resolve conflicts

Identify the conflicting files with `git diff --name-only --diff-filter=U` Read each conflicting file and understand both sides of the conflict Resolve the conflict by taking both sides into account — don't blindly pick one side. Understand the intent of each change and produce a result that incorporates both correctly. Stage the resolved files with `git add` If a conflict is ambiguous and you can't confidently determine the correct resolution, ask the user.

04
Step 4: Run related tests

Run the tests related to the files that had conflicts. If tests fail due to the conflict resolution, fix them before proceeding. If tests fail but seem unrelated to the rebase, verify by stashing and testing: If tests also fail without your changes, the failures are pre-existing. Note this for the user and continue. If tests only fail with your changes, the rebase introduced the problem. Investigate and fix.

05
Step 5: Continue the rebase

If there are more conflicts, go back to Step 3. Repeat until the rebase is complete.

06
Step 6: Check remote and compare

Check if a remote tracking branch exists: If a remote branch exists, run the `/remote-diff` skill to compare the rebase result against the remote and flag any potential issues. If no remote branch exists, skip this step and report that the rebase is complete.

Discussion

Powered by GitHub Discussions. Sign in with GitHub to comment, react, or subscribe.