This is the mail archive of the gdb-patches@sourceware.org mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

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


> 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


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]