Re: merge conlict?

[Andreas Schwab]

Óscar Fuentes <address@hidden> writes:

> And wouldn't you happy enough knowing the commit that merged the 3
> commits into trunk?

How do I know without looking into it?

> It is very likely that if strict commit requirements are imposed on
> private branches, people will refrain from doing local commits at
> all.

It will only require them to polish before pushing.

> Speaking as a newbie Emacs hacker, it is very encouraging to have the
> possibility of working on some feature without worrying about breaking
> things until the final point where the change is considered ready for
> trunk. OTOH, having to keep every local commit up to trunk standards
> looks very stressing. Not mentioning that most non-trivial new features
> necessarily start on an unstable state.

For some unknown reason this appears to work very well with a big
insignificant project.

Andreas.

-- 
Andreas Schwab, address@hidden
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."