Merging Changes with Main Branch

[nelsonic]

https://github.com/NataliaLKB/learn-git-basics/blame/1116839e12c4165cb1b232747b466189e216ec7c/README.md#L202
In some cases your changes will be merged into a diff "main" or "default" branch such as "develop"; it will depend on the preference of your team...

[NataliaLKB]

That is a great point. But is this something that people need to know within the first week of the course? I am trying not to add anything that makes it more confusing, as there are plenty of more advanced tutorials for these purposes.

[nelsonic]

Agree minimise confusion wherever possible. That's why having a FAQ section might be handy. #20 especially if you want to encourage contributions.

[NataliaLKB]

Good point. I think a FAQ would really help!