David Zhang wrote: > Hi gatekeeper, > > http://onnv.sfbay/links/flagdays/pages/2008080502.html > > For the flag day above, what if I got 2 more heads in my workspace.
Uh...'2 more', as in "now you have three"? or "2" as in "every time you do a pull with a conflict you get 2"? > What is the detailed steps to merge all of them? It seems that I merge a > lot of strange files into my worksapce. I don't know what "merge a lot of strange files" means.
