1

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 ?

2

Re: git. a question

Hello, Quadri, you wrote: Q> But me it seems that I made all not on ? Not one  you poured in, but as a whole all is true. Depends on process. Someone wishes to see the beautiful list  on a principal branch. Then, possibly, you should do git rebase.

3

Re: git. a question

Hello, Quadri, you wrote: Q> the First time faced with git. Q> So, there is a branch development. For operation over the project, I from it , created to myself a branch development_1. Q> Transited what that time, in a branch development  a heap of changes - ten . Q> for operation continuation it was necessary To me  a branch development in the. Q> I executed a command git merge origin/development. Resolved some conflicts and poured in in the branch all this economy one . Q> In this case all suits me. Q> but me it seems that I made all not on ? Looking that there for changes and what conflicts. An alternative variant - cut off the branch from a fork point (if you anywhere did not publish it), and paste it "on top" last  branches development. git help rebase

4

Re: git. a question

Hello, Quadri, you wrote: Q> the First time faced with git. Q> So, there is a branch development. For operation over the project, I from it , created to myself a branch development_1. Q> Transited what that time, in a branch development  a heap of changes - ten . Q> for operation continuation it was necessary To me  a branch development in the. Q> I executed a command git merge origin/development. Resolved some conflicts and poured in in the branch all this economy one . Q> In this case all suits me. Q> but me it seems that I made all not on ? https://habrahabr.ru/post/106912/