From: Simon Glass <sjg@chromium.org> Fix several issues with pickman's subtree update handling: resolve ambiguous checkout when multiple remotes share a branch name, add agent-based merge conflict resolution for subtree updates, fix push_branch() to properly propagate failures, and handle GitLab connection errors gracefully in step/poll commands. Also replace some broad Exception catches. Simon Glass (4): pickman: Fix ambiguous checkout in subtree update pickman: Add agent-based subtree merge conflict resolution pickman: Fix push_branch() to raise on failure pickman: Handle connection errors gracefully in do_step() tools/pickman/agent.py | 93 ++++++++++ tools/pickman/control.py | 131 ++++++++++---- tools/pickman/ftest.py | 352 +++++++++++++++++++++++++++++++++--- tools/pickman/gitlab_api.py | 9 +- 4 files changed, 525 insertions(+), 60 deletions(-) -- 2.43.0 base-commit: e383744126b96f0ae3511fa554ceac25b147d8b9 branch: pickg