assess to split confict to branches and atomic commits

[avallecam]

to cover the conflict episode in a 3h event, even reducing the time for ignoring-changes (lifecoding without practice).

we can divide the conflict episode by:

• keep introduction to conflicts
• move good practices checklist after introduction
• keep group challenge (with jamboard) after box of good practices
• keep create a conflict after challenge
• move create a branch to appendix (this can be an isolated episode, although is little content, should we merge this with git rebase ontop of main?)
• move atomic commits to tracking-changes (this is a good practice feature, was also asked in the in-person session, and may be good to show earlier once tracking changes gets repeated a lot of times within the session)