three_way_conflict_resolution__dcs7uCv

Status: Passed

Started: 3/19 15:20

Execution: 1m 7.3s

Test: 9.9s

Status: PassedStarted: 3/19/2026, 3:20:20 PMExecution: 1m 7.3sTest: 9.9s

[37m2026-03-19 07:23:23.122[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37mnative:1[39m[0m[0m[1m[37m	Pochi[39m[22m[0m[0m	pochi v0.6.0
[37m2026-03-19 07:23:23.206[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/root/pochi:503027[39m[0m[0m[1m[37m	loadAgents[39m[22m[0m[0m	Loaded 4 custom agents (4 valid, 0 invalid)
[37m2026-03-19 07:23:23.207[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/root/pochi:503028[39m[0m[0m[1m[37m	loadSkills[39m[22m[0m[0m	Loaded 2 skills (2 valid, 0 invalid)
[37m2026-03-19 07:23:23.291[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/root/pochi:439288[39m[0m[0m[1m[37m	PochiVendor[39m[22m[0m[0m	JWT is expiring or missing, fetching a new one
[37m2026-03-19 07:23:24.791[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 07:23:24.791[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 07:23:24.903[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/root/pochi:502453[39m[0m[0m[1m[37m	TaskRunner[39m[22m[0m[0m	Starting TaskRunner...
[37m2026-03-19 07:23:24.988[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/root/pochi:454195[39m[0m[0m[1m[37m	listFiles[39m[22m[0m[0m	Listing workspace files from /home/user/repo with maxItems [33m500[39m
[37m2026-03-19 07:23:25.105[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/root/pochi:496495[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 07:23:34.927[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/root/pochi:454195[39m[0m[0m[1m[37m	listFiles[39m[22m[0m[0m	Listing workspace files from /home/user/repo with maxItems [33m500[39m
[37m2026-03-19 07:23:36.996[39m[0m[0m	[33m[1mWARN[22m[39m[0m[0m	[37m[39m[0m[0m[1m[37m	GitStatus[39m[22m[0m[0m	readGitStatus timed out after 12000ms, returning undefined
[37m2026-03-19 07:23:37.488[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/root/pochi:496495[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 git merge conflicts in config.py by selecting settings from specific branches
[37m2026-03-19 07:23:40.002[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/root/pochi:454195[39m[0m[0m[1m[37m	listFiles[39m[22m[0m[0m	Listing workspace files from /home/user/repo with maxItems [33m500[39m
[37m2026-03-19 07:23:46.939[39m[0m[0m	[33m[1mWARN[22m[39m[0m[0m	[37m[39m[0m[0m[1m[37m	GitStatus[39m[22m[0m[0m	readGitStatus timed out after 12000ms, returning undefined
[37m2026-03-19 07:23:48.594[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/root/pochi:454195[39m[0m[0m[1m[37m	listFiles[39m[22m[0m[0m	Listing workspace files from /home/user/repo with maxItems [33m500[39m
[37m2026-03-19 07:23:51.816[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/root/pochi:454195[39m[0m[0m[1m[37m	listFiles[39m[22m[0m[0m	Listing workspace files from /home/user/repo with maxItems [33m500[39m
[37m2026-03-19 07:23:52.098[39m[0m[0m	[33m[1mWARN[22m[39m[0m[0m	[37m[39m[0m[0m[1m[37m	GitStatus[39m[22m[0m[0m	readGitStatus timed out after 12000ms, returning undefined
[37m2026-03-19 07:23:54.575[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/root/pochi:454195[39m[0m[0m[1m[37m	listFiles[39m[22m[0m[0m	Listing workspace files from /home/user/repo with maxItems [33m500[39m
[37m2026-03-19 07:23:57.399[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/root/pochi:454195[39m[0m[0m[1m[37m	listFiles[39m[22m[0m[0m	Listing workspace files from /home/user/repo with maxItems [33m500[39m
[37m2026-03-19 07:24:00.604[39m[0m[0m	[33m[1mWARN[22m[39m[0m[0m	[37m[39m[0m[0m[1m[37m	GitStatus[39m[22m[0m[0m	readGitStatus timed out after 12000ms, returning undefined
[37m2026-03-19 07:24:02.695[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/root/pochi:454195[39m[0m[0m[1m[37m	listFiles[39m[22m[0m[0m	Listing workspace files from /home/user/repo with maxItems [33m500[39m
[37m2026-03-19 07:24:03.825[39m[0m[0m	[33m[1mWARN[22m[39m[0m[0m	[37m[39m[0m[0m[1m[37m	GitStatus[39m[22m[0m[0m	readGitStatus timed out after 12000ms, returning undefined
[37m2026-03-19 07:24:06.193[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/root/pochi:454195[39m[0m[0m[1m[37m	listFiles[39m[22m[0m[0m	Listing workspace files from /home/user/repo with maxItems [33m500[39m
[37m2026-03-19 07:24:06.585[39m[0m[0m	[33m[1mWARN[22m[39m[0m[0m	[37m[39m[0m[0m[1m[37m	GitStatus[39m[22m[0m[0m	readGitStatus timed out after 12000ms, returning undefined
[37m2026-03-19 07:24:09.484[39m[0m[0m	[33m[1mWARN[22m[39m[0m[0m	[37m[39m[0m[0m[1m[37m	GitStatus[39m[22m[0m[0m	readGitStatus timed out after 12000ms, returning undefined
[37m2026-03-19 07:24:14.703[39m[0m[0m	[33m[1mWARN[22m[39m[0m[0m	[37m[39m[0m[0m[1m[37m	GitStatus[39m[22m[0m[0m	readGitStatus timed out after 12000ms, returning undefined
[37m2026-03-19 07:24:18.207[39m[0m[0m	[33m[1mWARN[22m[39m[0m[0m	[37m[39m[0m[0m[1m[37m	GitStatus[39m[22m[0m[0m	readGitStatus timed out after 12000ms, returning undefined
[37m2026-03-19 07:24:18.796[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/root/pochi:454195[39m[0m[0m[1m[37m	listFiles[39m[22m[0m[0m	Listing workspace files from /home/user/repo with maxItems [33m500[39m
[37m2026-03-19 07:24:21.936[39m[0m[0m	[32m[1mDEBUG[22m[39m[0m[0m	[37m/$bunfs/root/pochi:454195[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 19ms
============================= 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.15s ===============================