f003 — merge_conflicts

These commands set up the repo before the model sees the prompt. They define the starting file structure, staged changes, and Git history.

1. 01 git init
2. 02 git config user.email 'test@test.com'
3. 03 git config user.name 'Test User'
4. 04 echo 'Status: OK' > status.txt
5. 05 git add status.txt
6. 06 git commit -m 'Initial status'
7. 07 git checkout -b fix
8. 08 echo 'Status: Resolved' > status.txt
9. 09 git add status.txt
10. 10 git commit -m 'Fix status'
11. 11 git checkout main
12. 12 echo 'Status: Failed' > status.txt
13. 13 git add status.txt
14. 14 git commit -m 'Update status'
15. 15 git merge fix