f009 — 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 'Author: John' > author.txt
5. 05 git add author.txt
6. 06 git commit -m 'Initial author'
7. 07 git checkout -b fullname
8. 08 echo 'Author: John Smith' > author.txt
9. 09 git add author.txt
10. 10 git commit -m 'Use full name'
11. 11 git checkout main
12. 12 git checkout -b initials
13. 13 echo 'Author: J. Doe' > author.txt
14. 14 git add author.txt
15. 15 git commit -m 'Use initials'
16. 16 git checkout main
17. 17 git merge fullname
18. 18 git merge initials