[scm-migration-dev] multiple heads

2008-09-12 Thread Vladimir Marek
Hi, > http://onnv.sfbay/links/flagdays/pages/2008080502.html This is public mailinglist, folks outside do not have access to SWAN. Correct internal link would be rpe-scm-site-experts at sun.com . > For the flag day above, what if I got 2 more heads in my workspace. > What is the detailed steps t

[scm-migration-dev] multiple heads

2008-09-11 Thread Dan Mick
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 det

[scm-migration-dev] multiple heads

2008-09-11 Thread David Zhang
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. What is the detailed steps to merge all of them? It seems that I merge a lot of strange files into my worksapce. David