feat: add interactive --ask conflict resolution to update#46

dapi merged 3 commits into

maindapi/memory-bank-cli:mainfrom

codex/gh-45dapi/memory-bank-cli:codex/gh-45Copy head branch name to clipboard