This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: reject merges on gdb release branches?
- From: Ricard Wanderlof <ricard dot wanderlof at axis dot com>
- To: Eli Zaretskii <eliz at gnu dot org>
- Cc: Joel Brobecker <brobecker at adacore dot com>, "gdb-patches at sourceware dot org" <gdb-patches at sourceware dot org>
- Date: Thu, 23 Jan 2014 08:46:32 +0100
- Subject: Re: reject merges on gdb release branches?
- Authentication-results: sourceware.org; auth=none
- References: <20140122051133 dot GB4762 at adacore dot com> <83r480f2r2 dot fsf at gnu dot org> <20140122161520 dot GF4762 at adacore dot com> <83bnz4ezst dot fsf at gnu dot org>
On Wed, 22 Jan 2014, Eli Zaretskii wrote:
Note that a rebase, compared to a merge, is not that much more work,
and has the nice property of keeping the history linear.
Rebasing loses information (e.g., if I merged from master several
times during my work). And I don't really see the downsides of
merging to master.
I think it's not the merging per se that is a problem, only if it is done
incorrectly, i.e. merging from a branch that was was broken off from
master a long time ago, which brings in a lot of unwanted stuff.
Unfortunately it is all too easy to do that by mistake, especially if one
doesn't use git on a regular basis.
Loosing information about merges from master during a rebase I don't think
is too much of an issue. Once the branch has been rebased to master, any
merges from master would have occurred in the past anyway.
/Ricard
--
Ricard Wolf Wanderlöf ricardw(at)axis.com
Axis Communications AB, Lund, Sweden www.axis.com
Phone +46 46 272 2016 Fax +46 46 13 61 30