0

Here it is my problem: I use SourceTree to manager my work,while my colleague use Tortoisegit.

but we are in the same branch -- master,and I notice that the graph has many branchs:(the repository has only a master),why？there is not other branch..

enter image description here

and they sometimes commit a merge:

enter image description here

It confuses me,i throught merge in git is happened between two branchs,and i did review the documentation of merge:https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging.

KayWang
  • 71
  • 6
  • 1
    Every person using Git has their own copy of the repository, and those count as different branches when you merge them. (Also, branches as in diverging paths of history aren’t branches in the Git sense of “names that point to commits”.) – Ry- Jan 08 '18 at 10:37
  • 1
    Every time you pull, there is a merge done if you have local commits in your branch. Prefer a rebase workflow with`git pull --rebase` – Philippe Jan 08 '18 at 10:54

0 Answers0