From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtpout2.vodafonemail.de (smtpout2.vodafonemail.de [145.253.239.133]) by sourceware.org (Postfix) with ESMTPS id C6056385041C for ; Mon, 8 Mar 2021 17:38:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org C6056385041C Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=nexgo.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=Stromeko@nexgo.de Received: from smtp.vodafone.de (smtpa05.fra-mediabeam.com [10.2.0.35]) by smtpout2.vodafonemail.de (Postfix) with ESMTP id 0518F121612 for ; Mon, 8 Mar 2021 18:38:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nexgo.de; s=vfde-smtpout-mb-15sep; t=1615225101; bh=0k2sEodoRJnLtMnJTEUx1HE/A62H1g/OIVZwDOc7N0U=; h=From:To:Subject:References:Date:In-Reply-To; b=WiHjsEIOJrTurLi//hu5+JnSzsnPgm+/54x/UzUkRDwdrE03Rv6bAlUHFMZNsXa7e lQloIpbFpbpc1iAmxbOYv0/myLZnEEanvrB8fUdc1W5B0VbSiJpZe7oPsq2SLKpZa5 oKPEX0LmYQri+EIc5PFLFJBKzsa0MQrc7ufc92R0= Received: from Gertrud (p54a0ca05.dip0.t-ipconnect.de [84.160.202.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp.vodafone.de (Postfix) with ESMTPSA id B3B24140195 for ; Mon, 8 Mar 2021 17:38:20 +0000 (UTC) From: Achim Gratz To: cygwin-patches@cygwin.com Subject: Re: [PATCH] winsup/doc/dll.xml: update MinGW/.org to MinGW-w64/.org References: <20210307163155.63871-1-Brian.Inglis@SystematicSW.ab.ca> <38792da7-75f7-231d-0de2-d483b927820a@SystematicSw.ab.ca> Date: Mon, 08 Mar 2021 18:38:16 +0100 In-Reply-To: (Brian Inglis's message of "Mon, 8 Mar 2021 10:32:54 -0700") Message-ID: <87pn098s1j.fsf@Rainer.invalid> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-purgate-type: clean X-purgate-Ad: Categorized by eleven eXpurgate (R) http://www.eleven.de X-purgate: This mail is considered clean (visit http://www.eleven.de for further information) X-purgate: clean X-purgate-size: 703 X-purgate-ID: 155817::1615225100-000007B2-C464553C/0/0 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: cygwin-patches@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component patch submission and discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Mar 2021 17:38:25 -0000 Brian Inglis writes: > Thanks - I'll try to remember to try that - on a pull conflict I > normally try to checkout -- file(s), then -f, then origin/master, then > plus -f, with status checks between, then commit -m merge when > required, and re-pull origin/master to check resynced to upstream > remote. git status That usually tells you what it is that prevents pulling. Aside from that, you can always do git remote update to get the objects and then figure out how to pull the branch. Regards, Achim. -- +<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+ Samples for the Waldorf Blofeld: http://Synth.Stromeko.net/Downloads.html#BlofeldSamplesExtra