>I would like to show how to work in collaboration (remote branches) too later, >if you want to give a hand, I would appreciate it.
I am happy to give a hand but I would like you to consider the idea of keeping the steps maybe a little simpler at the expense of clean merge lines for right now. Let's at least discuss it.