fix(cli): improve command conflict handling for skills#21942

NTaylorMullen merged 1 commit intomaingoogle-gemini/gemini-cli:mainfrom

ntm/fix-slash-command-conflictsgoogle-gemini/gemini-cli:ntm/fix-slash-command-conflictsCopy head branch name to clipboard