Skip to main content

Scenario: feature-branch-changed

The monorepo is on a branch upstream doesn't have, and the splice changed on it.

  • Monorepo (vendor/a/): cloned at seed on main, then the branch feature with a local commit.
  • Upstream: only main.

"New" counts the commits that upstream's default branch, main, lacks.

Output​

setup.bash builds this state:

$ build_scenario scenario_feature_branch_changed
$ git splice status
On branch feature

new, ahead 1 vendor/a push creates the branch
$ git splice log
=== vendor/a (upstream has no 'feature' branch -- compared with 'main')
< e859a6b local change (Test <test@example.com>)

push creates feature upstream, on top of main:

$ git splice push vendor/a
?? vendor/a: upstream has no 'feature' branch yet -- this push creates it
ok vendor/a: pushed e859a6b to feature
$ git splice status
On branch feature

up to date vendor/a