From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 104835 invoked by alias); 31 Mar 2018 01:52:48 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 104826 invoked by uid 89); 31 Mar 2018 01:52:48 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_NONE,SPF_PASS autolearn=ham version=3.3.2 spammy=conflict X-HELO: rock.gnat.com Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 31 Mar 2018 01:52:46 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id DA0BA116A4B; Fri, 30 Mar 2018 21:52:44 -0400 (EDT) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id hdgn9Yoc-oQN; Fri, 30 Mar 2018 21:52:44 -0400 (EDT) Received: from joel.gnat.com (localhost.localdomain [127.0.0.1]) by rock.gnat.com (Postfix) with ESMTP id A43EA1168CB; Fri, 30 Mar 2018 21:52:44 -0400 (EDT) Received: by joel.gnat.com (Postfix, from userid 1000) id E3B788330A; Fri, 30 Mar 2018 18:52:42 -0700 (PDT) Date: Sat, 31 Mar 2018 01:52:00 -0000 From: Joel Brobecker To: Weimin Pan Cc: Simon Marchi , gdb-patches@sourceware.org Subject: Re: [PATCH5 PR gdb/16959] gdb hangs in infinite recursion Message-ID: <20180331015242.zndajxnpmpieltto@adacore.com> References: <1522269884-129860-1-git-send-email-weimin.pan@oracle.com> <20cf4b23322670e4dc513183ef2dda45@polymtl.ca> <96ab9fda-2c03-a9c6-1da9-70e807e69e5c@oracle.com> <3505af0b-d303-b556-0a4c-c416ac88a064@polymtl.ca> <337f2b1f-6fe8-07f3-f4cd-a9b5a3d5456d@oracle.com> <20180330225218.fqhgvt7pzaqewic3@adacore.com> <0bb09bd9-812c-0665-3112-353c0e9cef0e@oracle.com> <20180330234143.mtj7u2xcfi7oxli4@adacore.com> <8c729b8f-24db-c746-e0e6-744ca7edd92f@oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <8c729b8f-24db-c746-e0e6-744ca7edd92f@oracle.com> User-Agent: NeoMutt/20170113 (1.7.2) X-SW-Source: 2018-03/txt/msg00633.txt.bz2 > > 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