From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Theodor Thornhill Newsgroups: gmane.emacs.devel Subject: Re: Gitlab Migration Date: Sun, 29 Aug 2021 10:39:41 +0200 Message-ID: <715352E4-6FFD-46BF-8D4C-34D376980663@thornhill.no> References: <8d0be260-7b15-0b48-42e5-e5a4cc203e54@yandex.ru> <837dg4n1ix.fsf@gnu.org> <834kb8mzk1.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="23392"; mail-complaints-to="usenet@ciao.gmane.io" Cc: dgutov@yandex.ru, larsi@gnus.org, danflscr@gmail.com, philipk@posteo.net, monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Drew DeVault , Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Aug 29 10:41:35 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 1mKGNi-0005tI-IA for ged-emacs-devel@m.gmane-mx.org; Sun, 29 Aug 2021 10:41:35 +0200 Original-Received: from localhost ([::1]:55272 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mKGNg-0005y1-Jf for ged-emacs-devel@m.gmane-mx.org; Sun, 29 Aug 2021 04:41:32 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:56664) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKGLz-0004NE-3a for emacs-devel@gnu.org; Sun, 29 Aug 2021 04:39:47 -0400 Original-Received: from out0.migadu.com ([2001:41d0:2:267::]:40108) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKGLx-00051o-Ec; Sun, 29 Aug 2021 04:39:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=thornhill.no; s=key1; t=1630226383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Dk9qp0w4nhcnUBwewfvA5okN4NSkFga9S1g5flN6duI=; b=x26YlsFq5mNMzn9W1BxV/9FMUibNwgL2LGIBrBKp954OdzDSLCxm/P25ki7YjVGU088DUk n1+4ncpVIrBIYWvDszrm/8wAhY8yxTL5KYL4a9qeT8U3tBcXMaEgakFTi952zKm17rF/39 Vmklc1GBzHTbYxYn7CB/pRrlR1Rf3JzFelHVtFmoDHcl6SJ8+FOBLMsKbuyEfuaH0PWSpm eJzu2ZAOhx/Jt7mpyP4ATtx9Y7lD5Jfp8aeQTttgtacDOAcJflHLepsSXqzCCoexx9yMmG GX2bc+BXbC0511vFxqV4Z1rF3sGuzSsFP6oN0y3JiLHJOm4zd0Z9UbkcUN1lzQ== X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. In-Reply-To: X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: theo@thornhill.no Received-SPF: pass client-ip=2001:41d0:2:267::; envelope-from=theo@thornhill.no; helo=out0.migadu.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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:273391 Archived-At: On 29 August 2021 10:33:01 CEST, Drew DeVault wrote: >On Sun Aug 29, 2021 at 10:30 AM CEST, Theodor Thornhill wrote: >> I know one way to do this, after having to untangle a coworkers mess a >> couple of years ago: >> >> 1=2E Create your branch >> 2=2E Make some commits >> 3=2E Push them because work day over >> 4=2E Next day realize you should change something >> 5=2E Edit history >> 6=2E Get message from git that remote is diverged, pull to fix >> 7=2E Get a million conflicts with old commits >> 8=2E Resolve conflicts >> 9=2E Force push >> 10=2E Since this took all day leave work >> 11=2E Go back to 4 >> >> You won't believe how crazy this case become=2E I've seen same commit a= t >> least 6 times in the same pr=2E > >Are you sure you're rebasing in this scenario and not making merge >commits? If you can come up with a series of git commands which >reproduces this scenario, I would like to investigate further=2E Let's >follow up off-list=2E Sure=2E I'll try to make a repro later today if time permits and notify yo= u with the results=2E