Re: merge conlict?

[Karl Fogel]

"Stephen J. Turnbull" <address@hidden> writes:
>Karl Fogel writes:
>
> > Is the problem that some people are saying that all the internal commits
> > on your local branch should be clean & buildable & lint-free, in
> > addition to the final merge being similarly clean?
>
>Nobody is saying that.  What some people are saying is that all
>*external* commits you push to a *global* repository should be clean
>and/or buildable and/or lint-free.  AFAIK Linux demands that, and I'm
>sure there are other projects that do, although I don't know of them
>offhand.

I might have mis-used terminology.  What I meant was:

No developer should leave the tip of the public mainline in a broken
state.

Do we demand something stricter than that?