Re: reject merges on gdb release branches?

Eli Zaretskii
2014-01-24T15:44:59Z

> Date: Fri, 24 Jan 2014 06:45:11 -0800
> From: "H.J. Lu" <hjl.tools@gmail.com>
> Cc: Joel Brobecker <brobecker@adacore.com>, Will Newton <will.newton@linaro.org>,
> ricard.wanderlof@axis.com, GDB <gdb-patches@sourceware.org>
>
> I use both rebase and merge. I use merge on hjl/linux/master
> branch since I need to go back to checkout previous trees on
> my branch. Rebase won't work for me here.
>
> But for hjl/mpx/pltext8 branch, I use rebase since I
> plan to commit it to master when the work is complete
> and I don't need to go back in history.
>
> I don't care about the history of each commit on master
> and release branches. Merge will only confuse me.
> But you can tag your merged commit before rebase or
> create a branch for it. All history will be there for you
> and it won't confuse other people.

There's any number of workflows that git allows. As long as master
only gets pushes that add commits, I don't see why we should force a
particular workflow and disallow all others. You should be able to
use yours, and I should be able to use mine. Sorry, but I refuse to
believe that people who develop and maintain GDB and Binutils are
confused by a DAG that has a few merges.