Resolving Git Merge Conflicts After Cherry-Pick - Fix VSCode IntelliSense Not Working with TypeScript-Git index.lock File Exists: Quick Fix Checklist

Final checklist
- Confirm that the same symptom is gone after a restart or refresh.
- Keep the smallest working change and undo temporary diagnostic settings.