From: Joel Brobecker <brobecker@adacore.com>
To: Weimin Pan <weimin.pan@oracle.com>
Cc: Simon Marchi <simon.marchi@polymtl.ca>, gdb-patches@sourceware.org
Subject: Re: [PATCH5 PR gdb/16959] gdb hangs in infinite recursion
Date: Sat, 31 Mar 2018 01:52:00 -0000 [thread overview]
Message-ID: <20180331015242.zndajxnpmpieltto@adacore.com> (raw)
In-Reply-To: <8c729b8f-24db-c746-e0e6-744ca7edd92f@oracle.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
next prev parent reply other threads:[~2018-03-31 1:52 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-28 21:11 Weimin Pan
2018-03-30 5:09 ` Simon Marchi
2018-03-30 21:44 ` Weimin Pan
2018-03-30 22:05 ` Simon Marchi
2018-03-30 22:39 ` Weimin Pan
2018-03-30 22:52 ` Joel Brobecker
2018-03-30 23:32 ` Weimin Pan
2018-03-30 23:45 ` Joel Brobecker
2018-03-30 23:32 ` Weimin Pan
2018-03-30 23:41 ` Joel Brobecker
2018-03-31 0:31 ` Weimin Pan
2018-03-31 1:52 ` Joel Brobecker [this message]
2018-03-31 3:32 ` Wei-min Pan
2018-04-02 13:44 ` Joel Brobecker
2018-04-02 17:27 ` Wei-min Pan
2018-04-02 17:53 ` Joel Brobecker
2018-04-02 19:28 ` [pushed][PATCH5 " Weimin Pan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180331015242.zndajxnpmpieltto@adacore.com \
--to=brobecker@adacore.com \
--cc=gdb-patches@sourceware.org \
--cc=simon.marchi@polymtl.ca \
--cc=weimin.pan@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox