fix(agent-manager): preserve local edits during base updates - #13780

fix(agent-manager): preserve local edits during base updates#13780

marius-kilocode merged 1 commit into

mainKilo-Org/kilocode:mainfrom

improve-merge-conflict-resolution-workflowKilo-Org/kilocode:improve-merge-conflict-resolution-workflowCopy head branch name to clipboard