three_way_conflict_resolution__8SxSSvF

Status: Passed

Started: 3/19 17:05

Execution: 29.1s

Test: 10.4s

Status: PassedStarted: 3/19/2026, 5:05:16 PMExecution: 29.1sTest: 10.4s

[37m2026-03-19 09:09:44.071[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37mnative:1[39m[0m[0m[1m[37m	Pochi[39m[22m[0m[0m	pochi v0.6.1
[37m2026-03-19 09:09:44.151[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/root/pochi:503183[39m[0m[0m[1m[37m	loadAgents[39m[22m[0m[0m	Loaded 5 custom agents (5 valid, 0 invalid)
[37m2026-03-19 09:09:44.151[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/root/pochi:503184[39m[0m[0m[1m[37m	loadSkills[39m[22m[0m[0m	Loaded 2 skills (2 valid, 0 invalid)
[37m2026-03-19 09:09:44.234[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/root/pochi:439420[39m[0m[0m[1m[37m	PochiVendor[39m[22m[0m[0m	JWT is expiring or missing, fetching a new one
[37m2026-03-19 09:09:45.729[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/root/pochi:415701[39m[0m[0m[1m[37m	MCPHub[39m[22m[0m[0m	MCP servers configuration changed via signal:
[37m2026-03-19 09:09:45.729[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/root/pochi:415813[39m[0m[0m[1m[37m	MCPHub[39m[22m[0m[0m	Build MCPHub Status
[37m2026-03-19 09:09:45.839[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/root/pochi:502609[39m[0m[0m[1m[37m	TaskRunner[39m[22m[0m[0m	Starting TaskRunner...
[37m2026-03-19 09:09:45.920[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/root/pochi:454339[39m[0m[0m[1m[37m	listFiles[39m[22m[0m[0m	Listing workspace files from /home/user/repo with maxItems [33m500[39m
[37m2026-03-19 09:09:46.026[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/root/pochi:496641[39m[0m[0m[1m[37m	generateTaskTitle[39m[22m[0m[0m	Generating task title, old: null, new: The repository at `/home/user/repo` has a merge commit `merge-ab` that merges two branches (`branch-a` and `branch-b`) which both modified `src/config.py` from a common base. The merge has conflicts.
[37m2026-03-19 09:09:54.597[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/root/pochi:454339[39m[0m[0m[1m[37m	listFiles[39m[22m[0m[0m	Listing workspace files from /home/user/repo with maxItems [33m500[39m
[37m2026-03-19 09:09:56.485[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/root/pochi:454339[39m[0m[0m[1m[37m	listFiles[39m[22m[0m[0m	Listing workspace files from /home/user/repo with maxItems [33m500[39m
[37m2026-03-19 09:09:56.962[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/root/pochi:496641[39m[0m[0m[1m[37m	generateTaskTitle[39m[22m[0m[0m	Generating task title, old: The repository at `/home/user/repo` has a merge commit `merge-ab` that merges two branches (`branch-a` and `branch-b`) which both modified `src/config.py` from a common base. The merge has conflicts., new: Resolve config.py merge conflicts with specific settings and document resolution summary
[37m2026-03-19 09:10:01.105[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/root/pochi:454339[39m[0m[0m[1m[37m	listFiles[39m[22m[0m[0m	Listing workspace files from /home/user/repo with maxItems [33m500[39m
[37m2026-03-19 09:10:03.787[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/root/pochi:454339[39m[0m[0m[1m[37m	listFiles[39m[22m[0m[0m	Listing workspace files from /home/user/repo with maxItems [33m500[39m
[37m2026-03-19 09:10:06.200[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/root/pochi:454339[39m[0m[0m[1m[37m	listFiles[39m[22m[0m[0m	Listing workspace files from /home/user/repo with maxItems [33m500[39m
[37m2026-03-19 09:10:08.548[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/root/pochi:454339[39m[0m[0m[1m[37m	listFiles[39m[22m[0m[0m	Listing workspace files from /home/user/repo with maxItems [33m500[39m

Hit:1 http://archive.ubuntu.com/ubuntu noble InRelease
Hit:2 http://archive.ubuntu.com/ubuntu noble-updates InRelease
Hit:3 http://archive.ubuntu.com/ubuntu noble-backports InRelease
Hit:4 http://security.ubuntu.com/ubuntu noble-security InRelease
Reading package lists...
Reading package lists...
Building dependency tree...
Reading state information...
curl is already the newest version (8.5.0-2ubuntu10.8).
0 upgraded, 0 newly installed, 0 to remove and 13 not upgraded.
downloading uv 0.9.7 x86_64-unknown-linux-gnu
no checksums to verify
installing to /home/user/.local/bin
  uv
  uvx
everything's installed!

To add $HOME/.local/bin to your PATH, either restart your shell or run:

    source $HOME/.local/bin/env (sh, bash, zsh)
    source $HOME/.local/bin/env.fish (fish)
Downloading pygments (1.2MiB)
 Downloading pygments
Installed 6 packages in 16ms
============================= test session starts ==============================
platform linux -- Python 3.12.3, pytest-8.4.1, pluggy-1.6.0
rootdir: /tests
plugins: json-ctrf-0.3.5
collected 9 items

../../../tests/test_outputs.py .........                                 [100%]

==================================== PASSES ====================================
=========================== short test summary info ============================
PASSED ../../../tests/test_outputs.py::test_no_conflicts_remain
PASSED ../../../tests/test_outputs.py::test_config_has_production_host
PASSED ../../../tests/test_outputs.py::test_config_has_production_port
PASSED ../../../tests/test_outputs.py::test_config_has_prod_db_name
PASSED ../../../tests/test_outputs.py::test_config_has_debug_log_level
PASSED ../../../tests/test_outputs.py::test_config_has_max_connections_50
PASSED ../../../tests/test_outputs.py::test_config_has_timeout_60
PASSED ../../../tests/test_outputs.py::test_resolution_summary_exists
PASSED ../../../tests/test_outputs.py::test_working_copy_clean
============================== 9 passed in 0.17s ===============================