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

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

On 3/30/2018 6:52 PM, Joel Brobecker wrote:
>>> Not quite. It is telling you that your "fixes" branch is behind
>>> upstream's "master".  You need to do a "rebase" your "fixes" branch
>>> instead (while having the "fixes" being the current branch):
>>>
>>>       $ git rebase upstream/master
>>>
>>> You may have some conflicts to resolve, particularly around
>>> ChangeLog files.
>> After the "git rebase" command, it no longer points to my branch:
> That tells me the rebase did not complete successfully (the merge
> conflict I was talking about). What output did you get when you
> rebased? Did you resolve the merge conflict? And after you did so,
> did you do a "git rebase --continue"?

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.

> Looking around, I found the following documentation which seems to
> provide some information on how to handle merge conflicts after
> a git rebase.
>
> https://help.github.com/articles/resolving-merge-conflicts-after-a-git-rebase/
> https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/
> https://help.github.com/articles/about-merge-conflicts/

Will read the above documentation for clue. Thanks.

> If you're not sure where you are, right now, try the following:
>
>      $ git rebase --abort
>
> That should abort the rebase operation, and get you back where you
> started; and in particular, the current branch should be back to
> the "fixes" branch.
>