clawdie/colibri
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions 52

fix: resolve merge conflict markers in mcp-ssh + schema (PR #240 merge artifact) #241

Merged
clawdie merged 1 commit from hotfix/merge-conflict-markers into main 2026-06-27 21:32:06 +02:00
Conversation 0 Commits 1 Files changed 2 +2 -10
clawdie commented 2026-06-27 21:31:43 +02:00
Owner
Copy link

Two files had unresolved <<<<<<< HEAD / >>>>>>> markers committed to main:

  • colibri-mcp-ssh: resolved to JSON proof_text example + screenshot_uuid
  • mother_schema.sql: resolved to both columns (proof_text + screenshot_uuid)
Two files had unresolved <<<<<<< HEAD / >>>>>>> markers committed to main: - colibri-mcp-ssh: resolved to JSON proof_text example + screenshot_uuid - mother_schema.sql: resolved to both columns (proof_text + screenshot_uuid)
clawdie added 1 commit 2026-06-27 21:31:47 +02:00
fix: resolve merge conflict markers in mcp-ssh + schema (PR #240 merge artifact)
Some checks are pending
CI / rust (pull_request) Waiting to run
Details
CI / markdown (pull_request) Waiting to run
Details
CI / port (pull_request) Waiting to run
Details
CI / agent-jail-pkgs (pull_request) Waiting to run
Details
3becc6c190 
Two files had unresolved <<<<<<< HEAD / >>>>>>> markers committed to main:
- colibri-mcp-ssh: resolved to JSON proof_text example + screenshot_uuid
- mother_schema.sql: resolved to both columns (proof_text + screenshot_uuid)
clawdie merged commit a5c9da3ef6 into main 2026-06-27 21:32:06 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
first-proof blocker

gates the first proven end-to-end

  
hardening

security/robustness follow-up, not a first-proof gate

No labels
first-proof blocker
hardening
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: clawdie/colibri#241
No description provided.
Delete branch "hotfix/merge-conflict-markers"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?