f002 — 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 'VERSION=1.0.0' > version.txt
5. 05 git add version.txt
6. 06 git commit -m 'Initial version'
7. 07 git checkout -b release
8. 08 echo 'VERSION=2.0.0' > version.txt
9. 09 git add version.txt
10. 10 git commit -m 'Bump major version'
11. 11 git checkout main
12. 12 echo 'VERSION=1.1.0' > version.txt
13. 13 git add version.txt
14. 14 git commit -m 'Bump minor version'
15. 15 git merge release