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

[Joel Brobecker <brobecker at adacore dot com>]

> > 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"?

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/

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.

-- 
Joel