Topic: git. a question
The first time faced with git. So, there is a branch development. For operation over the project, I from it , created to myself a branch development_1. Transited what that time, in a branch development a heap of changes - ten . For operation continuation it was necessary to me a branch development in the. I executed a command git merge origin/development. Resolved some conflicts and poured in in the branch all this economy one . In this case all suits me. But it seems to me that I made all not on ?