mosaic/stack
1
0
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects Releases 2 Wiki Activity

[ORCH-112] Conflict detection #213

New Issue
Closed
opened 2026-02-02 18:58:30 +00:00 by jason.woltje · 2 comments
jason.woltje commented 2026-02-02 18:58:30 +00:00
Owner
Copy Link

Detect merge conflicts before pushing.

Acceptance Criteria

  • src/git/conflict-detection.ts implemented
  • Fetch latest from remote before push
  • Detect merge conflicts
  • Return conflict details to agent
  • Agent retries with rebase/merge

Dependencies

  • Blocked by: #ORCH-110

Technical Notes

Check for conflicts before push. If conflicts, agent must resolve.

Detect merge conflicts before pushing. ## Acceptance Criteria - [ ] `src/git/conflict-detection.ts` implemented - [ ] Fetch latest from remote before push - [ ] Detect merge conflicts - [ ] Return conflict details to agent - [ ] Agent retries with rebase/merge ## Dependencies - Blocked by: #ORCH-110 ## Technical Notes Check for conflicts before push. If conflicts, agent must resolve.
jason.woltje added this to the M6-AgentOrchestration (0.0.6) milestone 2026-02-02 18:58:30 +00:00
jason.woltje added the orchestrator label 2026-02-02 18:58:30 +00:00
jason.woltje commented 2026-02-02 23:16:53 +00:00
Author
Owner
Copy Link

Duplicate of #247 which was completed. Closing duplicate issue.

Duplicate of #247 which was completed. Closing duplicate issue.
jason.woltje commented 2026-02-02 23:17:11 +00:00
Author
Owner
Copy Link

Duplicate of #247 which was completed. Closing duplicate issue.

Duplicate of #247 which was completed. Closing duplicate issue.
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
ai
AI/LLM integration
 api
Backend/API work
 api
auth
Authentication
 database
database
Database/schema work
 devops
Docker/deployment
 docs
Documentation
 frontend
graph
knowledge-module
migration
Data migration
 orchestrator
Orchestrator service (apps/orchestrator/)
 p0
Critical priority
 p1
High priority
 p2
Medium priority
 p3
Low priority
 performance
Performance work
 phase-1
phase-2
phase-3
phase-4
phase-5
plugin
MoltBot plugin work
 search
security
Security-related
 setup
Initial setup
 testing
Testing/QA
 web
Frontend work
No Label orchestrator
Milestone
No items
No Milestone M6-AgentOrchestration (0.0.6)
Projects
Clear projects
No project
Assignees
Clear assignees
jason.woltje
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: mosaic/stack#213
Delete Branch "%!s()"

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?