summaryrefslogtreecommitdiff
path: root/makima/frontend/src/components/mesh/MergeConflictResolver.tsx
diff options
context:
space:
mode:
authorsoryu <soryu@soryu.co>2026-02-19 23:40:07 +0000
committerGitHub <noreply@github.com>2026-02-19 23:40:07 +0000
commited84d7ec5ece272a2cb8dabd36cbd6074df0887e (patch)
treead8bd85b44c577e656274bc846b0051837907038 /makima/frontend/src/components/mesh/MergeConflictResolver.tsx
parent28b191cc0b0e69b864191673df9c141730c93e4f (diff)
downloadsoryu-ed84d7ec5ece272a2cb8dabd36cbd6074df0887e.tar.gz
soryu-ed84d7ec5ece272a2cb8dabd36cbd6074df0887e.zip
feat: add git/gh auth checks, git fetch on worktree, fix contracts overflow (#72)
* feat: soryu-co/soryu - makima: Fix contracts page overflow - constrain layout to viewport height * feat: soryu-co/soryu - makima: Add git fetch to create_worktree and improve completion prompt merge conflict handling * WIP: heartbeat checkpoint
Diffstat (limited to 'makima/frontend/src/components/mesh/MergeConflictResolver.tsx')
0 files changed, 0 insertions, 0 deletions