vamseeachanta Work Around Merge Conflicts in Test Execution
When merge conflicts block uv run or pytest, locate the existing venv and run tests directly with Python, bypassing the broken conftest.py or pyproject.toml. Check venv location with find . -name activate, activate it, verify dependencies with pip list, then run tests with python -m pytest --override-ini="..." or execute test modules directly with python. This preserves test validation while avoiding conflict resolution that could affect other work.