Resolving Git Merge Conflicts in package-lock.json - Docker Context Canceled on macOS: Troubleshooting Guide-Stop Git Index Lock File Errors

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