On Jan 30, 2:53 am, Ben Smith <[email protected]> wrote: > It does what it can automatically, but there are situations where you > still must resolve conflicts by hand. I rarely find myself in this situations as the merge is quite good, also, there's a fairly good tutorial/overview how it all works: http://hgbook.red-bean.com/read/a-tour-of-mercurial-merging-work.html
Also I'd recommend http://hgbook.red-bean.com/read/ as well as http://mercurial.selenic.com/wiki/Tutorial http://mercurial.selenic.com/wiki/UnderstandingMercurial http://mercurial.selenic.com/wiki/QuickStart -- You received this message because you are subscribed to the Google Groups "pyglet-users" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/pyglet-users?hl=en.
