Fixing Unresolved Paths After Git Merge Conflict Rebase - PowerShell Venv Activation Not Working-Fix Git Push Rejected Non Fast Forward Force

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