Re: reject merges on gdb release branches?

Joel Brobecker
2014-01-24T11:38:45Z

[resending without the png attachement - the list rejects png]

On Fri, Jan 24, 2014 at 03:30:14PM +0400, Joel Brobecker wrote:
> > > If there are conflicts between your branch and the master branch,
> > > and those conflicts are not trivial to resolve, the commits needs
> > > to be reviewed again.
> >
> > Of course. I'm talking about the situation after they are resolved
> > and the result is committed.
>
> So, concretely, you would also send the merge commit as an extra commit
> for review?
>
> > > > Anyway, we are going in circles. I'm not trying to convince you to
> > > > change your workflow, I'm asking to allow me to keep mine.
> > >
> > > But this is at the cost of everyone else finding it more difficult
> > > afterwards each time they consult the history.
> >
> > What difficulty are you talking about? Can you demonstrate on a real
> > history log that difficulty?
>
> Sure. Attached is a gittk screenshot.
>
> This discussion is taking more time than I have, unfortunately.
> I'll probably let you guys discuss it out, and I will live with
> the outcome. I'll have to say that this discussion did reinforce
> my feeling that the current rule has more benefits than drawbacks.

--
Joel