From: Joel Brobecker <brobecker@adacore.com>
To: Wei-min 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: Mon, 02 Apr 2018 13:44:00 -0000 [thread overview]
Message-ID: <20180402134426.e5ys64idqvdx2cyv@adacore.com> (raw)
In-Reply-To: <79789d48-f0d3-7a76-f22d-6db52e780389@oracle.com>
> 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.
--
Joel
next prev parent reply other threads:[~2018-04-02 13:44 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
2018-03-31 3:32 ` Wei-min Pan
2018-04-02 13:44 ` Joel Brobecker [this message]
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=20180402134426.e5ys64idqvdx2cyv@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