Re: Experimental branches

Cary Coutant
2015-01-15T23:04:43Z

>> On my experimental branch, I did "git merge master", then tried to
>> push. I got this:
>>
>> remote: *** This update introduces too many new commits (136), which would
>> remote: *** trigger as many emails, exceeding the current limit (100).
>> remote: *** Contact your repository adminstrator if you really meant
>> remote: *** to generate this many commit emails.
>> remote: error: hook declined to update
>> refs/heads/users/ccoutant/two-level-line-tables
>>
>> Clearly, I don't want to generate all those commit emails. What do I do instead?
>>
>
> Can you do a rebase first?

But I've already pushed several commits onto the upstream branch.
Everything I've read about git says don't rebase if you've already
pushed your branch upstream.

-cary