natosha at unity3d.com
Sat Jun 11 10:15:30 CDT 2011
On Sat, Jun 11, 2011 at 1:31 PM, norricorp <john at norricorp.f9.co.uk> wrote:
> Hi Na'Tosha,
> thanks for this. What about the situation where developer pulls latest
> central to local, merges, tests and before he pushes back, another
> has pushed back.
> Presumably one wants to avoid a situation where there are several heads in
> the central repos.
This is not allowed by default; the developer trying to push will be kindly
told he cannot push because it will create multiple heads. Of course you
can force-override this, but you have to do it willingly. So the developer
trying to push will need to pull down the new changes and merge them in
before he can push back.
> I will read the workflow wiki that you mention.
Although I don't know much about Bazaar, I know they also have some good
docs about possible workflows with DVCS systems that transfer well to
Mercurial (or Bazaar or Git). They might also be of use.
> View this message in context:
> Sent from the General mailing list archive at Nabble.com.
> Mercurial mailing list
> Mercurial at selenic.com
Build & Infrastructure Developer | Unity Technologies
*E-Mail:* natosha at unity3d.com
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the Mercurial