From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: David Engster Newsgroups: gmane.emacs.devel Subject: Re: Gitlab Migration Date: Sun, 29 Aug 2021 10:36:09 +0200 Message-ID: <874kb8d4w6.fsf@randomsample> References: <8d0be260-7b15-0b48-42e5-e5a4cc203e54@yandex.ru> <837dg4n1ix.fsf@gnu.org> <834kb8mzk1.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="10201"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: philipk@posteo.net, danflscr@gmail.com, theo@thornhill.no, emacs-devel@gnu.org, monnier@iro.umontreal.ca, dgutov@yandex.ru, larsi@gnus.org, Drew DeVault To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Aug 29 10:38:37 2021 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mKGKr-0002SD-Nf for ged-emacs-devel@m.gmane-mx.org; Sun, 29 Aug 2021 10:38:37 +0200 Original-Received: from localhost ([::1]:51058 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mKGKq-00035i-Aa for ged-emacs-devel@m.gmane-mx.org; Sun, 29 Aug 2021 04:38:36 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:56316) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKGJi-0002Ma-2p for emacs-devel@gnu.org; Sun, 29 Aug 2021 04:37:26 -0400 Original-Received: from [2a03:4000:42:1a1:9400:eeff:feb4:c8a0] (port=35778 helo=zplane.randomsample.de) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKGJd-000308-Sk for emacs-devel@gnu.org; Sun, 29 Aug 2021 04:37:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=randomsample.de; s=a; h=Content-Type:MIME-Version:Message-ID:Date: References:In-Reply-To:Subject:Cc:To:From:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=WbFj/5KVQ1J8wZl+HW442Nzofx25UXyJxwGKlDierXg=; b=icVTwNvNtgdi5tpuMG/hAeWIZ WCjHwgxm10Vz6RQZ8oL6gfXDLwhwceFEHxVuppJkE6x0hlkmq6fdr6vG8UBoc/cfw9BEnVEt8WUx1 CDEiJt2UJ8rxRokj53iTHxqVH+206w/8VIateYcUcxicQOxq4MnZgklYClDrOw92I7f5wJDsvhZW5 OR75Gqp7Y5FoNlkmfyT8KgRKfrDMgzuoOKOD9rBfpIeD3glkrhcFr5CHrwSL1isbz7SREOhivj5ne PFgSjuXO8hJotlUIT8N9GrR9Tke/j/6y+njRiApMe9h0O9xU0RTgGjt1XSdycW8Ky4yngOcxsjE6v FhXn+oGGw==; Original-Received: from ip5f5abab6.dynamic.kabel-deutschland.de ([95.90.186.182] helo=void) by zplane.randomsample.de with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mKGIU-00020f-4U; Sun, 29 Aug 2021 10:36:13 +0200 In-Reply-To: <834kb8mzk1.fsf@gnu.org> (Eli Zaretskii's message of "Sun, 29 Aug 2021 11:21:18 +0300") X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a03:4000:42:1a1:9400:eeff:feb4:c8a0 (failed) Received-SPF: pass client-ip=2a03:4000:42:1a1:9400:eeff:feb4:c8a0; envelope-from=deng@randomsample.de; helo=zplane.randomsample.de X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 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-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:273389 Archived-At: >> How do you end up with the same commit twice? > > I no longer remember the exact details, it was something we bumped > into during discussions when Emacs switched to Git. AFAIR, it had to > do with working on a feature branch and frequently rebasing it onto > the latest master (so that the feature branch doesn't diverge too > much), then later merging from the feature branch to master. Frequently rebasing onto latest master is fine. What happened was that people first did a 'merge-based workflow' by merging master into their feature branch, but then later *also* decided to rebase. You mustn't mix these two different workflow: you either regularly merge 'master' into your feature branch, or you regularly rebase. Never do both. -David