Re: reject merges on gdb release branches?

Joel Brobecker
2014-01-24T10:58:09Z

> It is helpful to anyone who wishes to understand the sequence of
> events that led to a certain line being what it is. Merges are in
> important part of that. E.g., suppose that a merge produced a
> conflict whose resolution mistakenly introduced a bug. If you
> eliminate the merge, you will be unable to understand the reasons for
> the buggy change, at least not easily.

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. Otherwise, you would essentially be pushing
an unreviewed commits (the merge commit).

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

--
Joel