Re: [PATCH5 PR gdb/16959] gdb hangs in infinite recursion

[Wei-min Pan <weimin.pan@oracle.com>]

On 4/2/2018 6:44 AM, Joel Brobecker wrote:
>> Sorry, I lost the output. But I did resolve the merge conflicts by modifying
>> the
>> ChangeLog files.  I just did a "git rebase  --continue" which I didn't do
>> before
>> and it points to my branch and shows my patch:
>>
>> %  git add ChangeLog
>> %  git add testsuite/ChangeLog
>> %  git rebase --continue
>> %  git commit --amend
>> %  git show
>>
>> But when I tried to push again, I got the same "non-fast-forward" error as
>> if no merges were ever done.
> This is most likely because someone pushed a change between the moment
> you fetched + rebased, and the moment you tried to push the rebased
> result. You're going to have to redo it again, I'm afraid. Once you
> learn to handle those merge failures quickly, this will almost never
> happen.
>

Hi Joel,

I tried it differently by merging the "fixes" branch to my "master" 
branch but got
the same "non-fast-forward"  error when pushing:

$ git checkout master
$ git merge fixes
$ git fetch upstream
$ git push upstream master:master
To ssh://sourceware.org/git/binutils-gdb.git
  ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 
'ssh://sourceware.org/git/binutils-gdb.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes before pushing again.  See the 'Note about
fast-forwards' section of 'git push --help' for details.

Maybe output from the "status" command sheds some light?

$ git status
# On branch master
# Your branch is ahead of 'origin/master' by 19 commits.
#
nothing to commit (working directory clean)

Thanks.