This is the mail archive of the
mailing list for the GDB project.
Re: reject merges on gdb release branches?
- From: Yao Qi <yao at codesourcery dot com>
- To: Joel Brobecker <brobecker at adacore dot com>
- Cc: <gdb-patches at sourceware dot org>
- Date: Wed, 22 Jan 2014 20:43:04 +0800
- Subject: Re: reject merges on gdb release branches?
- Authentication-results: sourceware.org; auth=none
- References: <20140122051133 dot GB4762 at adacore dot com> <52DF5B39 dot 1020209 at codesourcery dot com> <20140122073709 dot GE4762 at adacore dot com>
On 01/22/2014 03:37 PM, Joel Brobecker wrote:
> You are doing thing correctly. Another way to do things, if you have
> a large number of commits to push, is to "git rebase your-branch master;
> git checkout master; git merge your-branch", which should result in
> a "fast-forward merge" (which is actually not technically a merge).
> For more info, I really recommend you read a book such as "Pro Git",
> as understanding the models behind git is a worthwhile investment.
Thanks for the explanation.
> The purpose of this proposal is to make sure that people don't do
> "git merge my-commit-on-master" and push that to the release branch.
> This would have catastrophic consequences, as it would bring into
> the branch all commits on master since we created the release branch.
> Not what the contributor wanted, but very easy to do if you don't
> know git well enough.
That is true.