Re: reject merges on gdb release branches?

Yao Qi
2014-01-22T12:45:17Z

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.

--
Yao (é½å°§)