Scenario: diverged-common-ancestor

Both sides changed the same line since the clone.

Monorepo (vendor/a/): cloned at seed, then a local commit.
Upstream: seed, then another commit, already fetched.

Output

setup.bash builds this state:

$ build_scenario scenario_diverged_common_ancestor

$ git splice status
On branch main

  ahead 1, behind 1  vendor/a

$ git splice log
===  vendor/a (main)
< e859a6b local change  (Test <test@example.com>)
> 6045a98 upstream change  (Test <test@example.com>)

push refuses: upstream has a commit this branch lacks.

$ git splice push vendor/a
!!   vendor/a: upstream has commits this branch lacks -- run 'git splice pull vendor/a' first
!!   Failed: vendor/a
[1]

merge stops at the conflict, like any merge:

$ git splice merge vendor/a
Auto-merging vendor/a/file.txt
CONFLICT (content): Merge conflict in vendor/a/file.txt
!!   vendor/a: conflict -- resolve it, then 'git commit' (or 'git cherry-pick --abort' to give up)
!!   vendor/a: merge failed
!!   Failed: vendor/a
[1]

Resolve it and commit as usual:

$ git status --short
M  vendor/a/.splice
UU vendor/a/file.txt

$ printf 'seed\nlocal change\nupstream change\n' >vendor/a/file.txt && git add vendor/a/file.txt && git commit -q --no-edit

Upstream gets the local commit, joined with its own by a merge:

$ git splice push vendor/a
ok   vendor/a: pushed 7f55741 to main

$ git -C "$UPSTREAM" log --graph --format=%s main
*   splice: merge vendor/a from main at 6045a98
|\  
| * upstream change
* | local change
|/  
* seed

Output​

Output