From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Lars Magne Ingebrigtsen Newsgroups: gmane.emacs.devel Subject: Re: A simple git workflow for the rest of us Date: Sat, 15 Nov 2014 20:08:31 +0100 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416078570 11300 80.91.229.3 (15 Nov 2014 19:09:30 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 15 Nov 2014 19:09:30 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 15 20:09:23 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Xpiio-0006Ta-3N for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 20:09:22 +0100 Original-Received: from localhost ([::1]:41694 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xpiin-00020V-Aw for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 14:09:21 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43016) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpiiR-00020M-84 for emacs-devel@gnu.org; Sat, 15 Nov 2014 14:09:05 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XpiiL-0002xb-5W for emacs-devel@gnu.org; Sat, 15 Nov 2014 14:08:59 -0500 Original-Received: from hermes.netfonds.no ([80.91.224.195]:44595) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpiiK-0002xX-Ux for emacs-devel@gnu.org; Sat, 15 Nov 2014 14:08:53 -0500 Original-Received: from cm-84.215.51.58.getinternet.no ([84.215.51.58] helo=stories.gnus.org) by hermes.netfonds.no with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1Xpii0-0000WT-6v for emacs-devel@gnu.org; Sat, 15 Nov 2014 20:08:32 +0100 Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAMFBMVEVHAgDs6+r8/Py0bESY QR719POsWDHIkG3g3dr////+//5hCQGNMhWkTSt8GgfTx8LRaO5aAAACWElEQVQ4jW3Sb2iSQRwH 8OtVLxzGEzygRcmkENmLIMWtyPLF2Ci0UhJmL5KYXATzVZFIBHNsJYMShdWe5400iHhWI2FCg0ee VtmC0ida9gxqwiiJ4OSWGzFtkD2PlqnnF+4PfLj73R0HmFrux87LPcf8D6gPDxiXcerqy0kClGyr 0U5jB4jjjMh/7AB3iv12NN8BjhckeDqhJYAVsxCOoAoBUaEGQQLiQjqfs6MjJPDpfH4VnSQBgBQC KhIuAKBeA+A11w7bCaBOABXvIUDAAo8Rr22HHkEUUPFtl7Ed7qrFFM6gp0TxJzzmhczaAgHsdSxH qBDAjGIA8DxHwiOMBHEXQ8JjAWO0owPMgaIIvnQCxPOqU50AFzH+RMLUMXt6tf+rh4C5oiRBv7hM wMO0NGyx2I8SELsGhy3wg7YFWEruDH4LhH3yzdkGsLfOKNNNv7Si1DZM/gODY7C2zltWvjyzb9BT h5hZusQ05XbuYh3uSabeZrgJV7gaHOgNtMCmyaytwXhvINAMW1fMlRrcIMAaVIC1tm21ZbJeloGd kUymE/qWGpY3MkSrWSn3LtIC8IUMMXcWjrx3HdS79H8zLsHneqO8VQFmDs/KYeXGzbLcuSX4aoYD cSqVQ33VSFl3qFQO/Sprxn4n7esRLZimk7nF0lB4bEITCmmGaE1o/zffQlgLolQqv/iz27mb7qYp yul2Ovcu+b7TRjDt7XLYNkIaV3XCWQ1TuvCe0bT4zCuv0CUdn0sUTTWO2zPgW1fu4S2mbRtumm7A 2YGcAky8INmCzU/yI6vAH/nIj2HzCZPXAAAAAElFTkSuQmCC X-Now-Playing: Laub's _Filesharing_: "Wortspur" X-Hashcash: 1:23:141115:emacs-devel@gnu.org::RKPZ4kmNZZ8sCKzd:000000000000000000000000000000000000000001fZ4D In-Reply-To: (Lars Magne Ingebrigtsen's message of "Sat, 15 Nov 2014 17:09:59 +0100") User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) X-MailScanner-ID: 1Xpii0-0000WT-6v MailScanner-NULL-Check: 1416683312.72978@jdX9FxH88KNzZz3FFk8BkQ X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.224.195 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:177232 Archived-At: Lars Magne Ingebrigtsen writes: > ./trunk/admin/git-new-workdir trunk emacs-24 I had problems pushing to trunk now after doing a "git pull" on the main branch. The error message was, as usual, pretty obscure. But I went to the emacs-24 directory and did a "git pull" there, too. After that I could push to the main branch. Is this how new-workdir is supposed to work? If so, using a totally separate clone might be a better idea, because that's just too annoying. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no