top | item 7040402

(no title)

j-kidd | 12 years ago

> I don't know if you've looked at the graph of a Git repo where people merge instead of rebase

We use merge instead of rebase. Here's a snapshot of the graph:

  | | | | | | | | | | | | | | |                  
  * | | | | | | | | | | | | | |
  |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  | |_|/ / / / / / / / / / / / /
  |/| | | | | | | | | | | | | |
  | | | | | | | | | | | | | | |
There are only 4 people working on the repo.

discuss

order

lmm|12 years ago

I'd expect 5 lines (trunk + 4 branches). What're the others?

philwelch|12 years ago

Exactly! I feel like I need a drink after looking at that.