From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: "Drew DeVault" Newsgroups: gmane.emacs.devel Subject: Re: Gitlab Migration Date: Sun, 29 Aug 2021 10:33:01 +0200 Message-ID: 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="28979"; mail-complaints-to="usenet@ciao.gmane.io" Cc: philipk@posteo.net, danflscr@gmail.com, emacs-devel@gnu.org, monnier@iro.umontreal.ca, dgutov@yandex.ru, larsi@gnus.org To: "Theodor Thornhill" , "Eli Zaretskii" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Aug 29 10:34:03 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 1mKGGR-0007DM-Eu for ged-emacs-devel@m.gmane-mx.org; Sun, 29 Aug 2021 10:34:03 +0200 Original-Received: from localhost ([::1]:48590 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mKGGQ-0001Dw-65 for ged-emacs-devel@m.gmane-mx.org; Sun, 29 Aug 2021 04:34:02 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:55830) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKGFZ-0000XC-25 for emacs-devel@gnu.org; Sun, 29 Aug 2021 04:33:09 -0400 Original-Received: from out1.migadu.com ([2001:41d0:2:863f::]:50649) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKGFX-0007yw-Dk; Sun, 29 Aug 2021 04:33:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpwn.com; s=key1; t=1630225983; 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=7qYA8wFqzMUdiWhyoxHNrPErGy724OBW0WxN8AtdVHU=; b=VX4YuuAAEmWv7zina6CphqnVddMexmp42+EqDhDFClm+RChMMVhYepNLDS0C9r9sUgBYa3 ZxTTG1vfij03xb+Q6hU+K0yuO1H3pqFUCZdDu4qTFDJansJ3ehSSsApp0ry6hG0mGJs5+I yBhs8YATt6L2boJS1lH6FKbCrESnNIUxpeGAetTaoB5MGZ//x2PYF3+9SyKvOB4ICknf+A XDO1SV3iZ4yquv9BKtvbBM1j/hVnTyC58avZvhHMgNj/BVL280f7nRi3AiCfC+FViZrLzL Pqtm6TteRWjRRVTaNub2NMo5dv7TMs2ZNxOt+ZXVjkC8hLHs7BJG6LSnr0rwxw== 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: sir@cmpwn.com Received-SPF: pass client-ip=2001:41d0:2:863f::; envelope-from=sir@cmpwn.com; helo=out1.migadu.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, 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:273388 Archived-At: 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. Create your branch > 2. Make some commits > 3. Push them because work day over > 4. Next day realize you should change something > 5. Edit history > 6. Get message from git that remote is diverged, pull to fix > 7. Get a million conflicts with old commits > 8. Resolve conflicts > 9. Force push > 10. Since this took all day leave work > 11. Go back to 4 > > You won't believe how crazy this case become. I've seen same commit at > least 6 times in the same pr. 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. Let's follow up off-list.