This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: Merge commits to master?


On Tue, May 31, 2016 at 7:40 AM, Adhemerval Zanella
<adhemerval.zanella@linaro.org> wrote:
>
>
> On 31/05/2016 11:35, Carlos O'Donell wrote:
>> On 05/30/2016 06:34 PM, cvs-commit at gcc dot gnu.org wrote:
>>> - Log -----------------------------------------------------------------
>>> https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=7838d298d895f65247fb6b498db03a4336fc0506
>>>
>>> commit 7838d298d895f65247fb6b498db03a4336fc0506
>>> Merge: ca7e8dd 600c13b
>>> Author: Paul Pluzhnikov <ppluzhnikov@google.com>
>>> Date:   Mon May 30 15:33:13 2016 -0700
>>>
>>>     Merge branch 'master' of ssh://sourceware.org/git/glibc
>>
>> Paul,
>>
>> Is there any reason you did a merge?

This is because of my inexperience with git. Here is what I did:

git pull
git commit -a # commit deletion for BZ 19653
git push # error because of intervening commit
600c13bf7233b9612e772a94411b8d688b859142
git merge
git push

I am sure there is some magic sequence of
revert/reset/pull/commit/push I should have done instead.

Sorry about it.

P.S. If this needs fixing, I am probably not the best person to fix it either.

-- 
Paul Pluzhnikov


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]