f001 — 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 'Hello, World!' > greeting.txt
5. 05 git add greeting.txt
6. 06 git commit -m 'Initial greeting'
7. 07 git checkout -b feature
8. 08 echo 'Hello, World!!!' > greeting.txt
9. 09 git add greeting.txt
10. 10 git commit -m 'Add excitement'
11. 11 git checkout main
12. 12 echo 'Hello, Planet!' > greeting.txt
13. 13 git add greeting.txt
14. 14 git commit -m 'Update greeting'
15. 15 git merge feature