[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: merge conlict?
From: |
Stephen J. Turnbull |
Subject: |
Re: merge conlict? |
Date: |
Wed, 27 Jan 2010 02:13:10 +0900 |
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.
> The final merge needs to be of publishable quality, of course -- it's
> going on the mainline. But the commits that led up to it? That's
> really up to the committer(s). No one else ever has to build those
> commits, after all.
They don't *have* to, but they might *want* to. Eg, bisect.
- Re: merge conlict?, (continued)
- Re: merge conlict?, Óscar Fuentes, 2010/01/25
- Re: merge conlict?, Andreas Schwab, 2010/01/25
- Re: merge conlict?, Óscar Fuentes, 2010/01/25
- Re: merge conlict?, Andreas Schwab, 2010/01/25
- Re: merge conlict?, Óscar Fuentes, 2010/01/25
- Re: merge conlict?, Stefan Monnier, 2010/01/25
- Re: merge conlict?, Eli Zaretskii, 2010/01/26
- Re: merge conlict?, Stefan Monnier, 2010/01/26
- Re: merge conlict?, Eli Zaretskii, 2010/01/26
- Re: merge conlict?, Karl Fogel, 2010/01/26
- Re: merge conlict?,
Stephen J. Turnbull <=
- Re: merge conlict?, Karl Fogel, 2010/01/26
- Re: merge conlict?, Eli Zaretskii, 2010/01/26
- Re: merge conlict?, David Reitter, 2010/01/25
- Re: merge conlict?, Óscar Fuentes, 2010/01/25
- Re: merge conlict?, Andreas Schwab, 2010/01/25
- Re: merge conlict?, Stephen J. Turnbull, 2010/01/25
- Re: merge conlict?, David Reitter, 2010/01/25
- Re: merge conlict?, Teemu Likonen, 2010/01/25
- Re: merge conlict?, Thierry Volpiatto, 2010/01/25
- Re: merge conlict?, Óscar Fuentes, 2010/01/25