Avoid use of 'topic branches, merge to main'

[lexnederbragt]

How could the content be improved?

The 'Conflicts' episode (09-conflict.md) has a set of suggestions to reduce conflicts. However, the second bullet point Use topic branches to segregate work, merging to main when complete is potentially hard to grasp for our learners. We explain branches very superficially, do not mention that we ourselves can create branches, or what 'topic branches' are. Merging is included, but not really added to the mental model of the learners.

Do folks agree that we could remove it? Or at least reword it to point to more advance git functionality that is not taught in this lesson?

Which part of the content does your suggestion apply to?

https://github.com/swcarpentry/git-novice/blob/main/episodes/09-conflict.md?plain=1#L346

[erinmgraham]

Hi @lexnederbragt , thank you for your contribution! I agree, we should remove it for now. Would you like to create a PR? It's a small change, but we want to make sure you get the experience and credit if you'd like. Let us know! Thanks :-)