You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Conflicts:
refact-agent/gui/src/components/ChatForm/ChatForm.tsx
refact-agent/gui/src/hooks/index.ts
It looks like you may be committing a merge.
If this is not correct, please run
git update-ref -d MERGE_HEAD
and try again.
On branch dev
Your branch is up to date with 'origin/dev'.
All conflicts fixed but you are still merging.
Changes to be committed:
modified: src/components/ChatForm/ChatForm.tsx
modified: src/hooks/useSendChatRequest.ts
new file: src/hooks/useTotalTokenUsage.ts
Changes not staged for commit:
modified: src/components/ChatForm/ChatForm.tsx
0 commit comments