I have a question which confusing me a lot.
This is the work flow of git.
1,Fetch and merge changes from the remote
2,Create a branch to work on a new project feature
3,Develop the feature on your branch and commit your work
4,Fetch and merge from the remote again (in case new commits were made while you were working)
5,Push your branch up to the remote for review
i give you an example:
1, do git clone first
remote Sally branch A->B->C
local master branch A->B->C
2,do fetch and merge
remote Sally branch A->B->C->D
local master branch A->B->C->D
3, do feature on my own branch, but at the same time remote branch also changed.
remote Sally branch A->B->C->D->E
local master branch A->B->C->D->F
the questions is, how the 3rd step merge???
remote branch be fetched to origin/master,then local master branch merged it to be A->B->C->D->E->F??