[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: merge conlict?

From: Óscar Fuentes
Subject: Re: merge conlict?
Date: Tue, 26 Jan 2010 00:19:01 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux)

Andreas Schwab <address@hidden> writes:

> Ó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?

You can look into them. `bisect' tells you the merge commit. Then either
you read the merged revisions or, if you really enjoy bisecting,
reconstruct its original branch and bisect 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.

First, please let's bar the word "push" and its derivatives from Bazaar

Second, what you propose is quite a bit of work, and not of the trivial

>> 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.

Sorry, I'm not sure what you are referring to here.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]