# Work Around Merge Conflicts In Test Execution

> Run tests when repo has unresolved merge conflicts in config files by bypassing broken configs and executing tests directly

- Skill: `vamseeachanta/work-around-merge-conflicts-in-test-execution` (Agent Skill)
- Install (CLI): `npx skillmds@latest add vamseeachanta/work-around-merge-conflicts-in-test-execution`
- Raw SKILL.md: https://api.skillmd.com/api/skills/vamseeachanta/work-around-merge-conflicts-in-test-execution/raw
- Safety review: PASS (external: skill-scanner PASS, skillspector PASS)
- Works with: Claude Code, Claude.ai, OpenAI Codex
- Category: Coding & Dev Tools
- Author: vamseeachanta (https://skillmd.com/u/vamseeachanta)
- Updated: 2026-09-17
- Page: https://skillmd.com/skills/vamseeachanta/work-around-merge-conflicts-in-test-execution

---


# 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.