From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: theo@thornhill.no Newsgroups: gmane.emacs.devel Subject: Re: Gitlab Migration Date: Sun, 29 Aug 2021 11:33:44 +0000 Message-ID: <1ed3f32a6594bd1591d2c359c748846e@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="39728"; 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 13:35:16 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 1mKJ5m-000A3L-Vs for ged-emacs-devel@m.gmane-mx.org; Sun, 29 Aug 2021 13:35:16 +0200 Original-Received: from localhost ([::1]:41340 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mKJ5l-0005FJ-V4 for ged-emacs-devel@m.gmane-mx.org; Sun, 29 Aug 2021 07:35:13 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:46244) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKJ4Q-0003xz-J6 for emacs-devel@gnu.org; Sun, 29 Aug 2021 07:33:54 -0400 Original-Received: from out0.migadu.com ([94.23.1.103]:19657) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKJ4N-0003dH-Lu; Sun, 29 Aug 2021 07:33:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=thornhill.no; s=key1; t=1630236824; 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=sr866T9kQT0rS4MX0QiToEJrDOiUZp3kn/+KPPAJw5c=; b=Y6K5uEhnrS9ZFSXE9hXXaRn8LNQFhtFvdSVy12KrtRv0Q2+SXoMs1Fy7Q2wI4WQW1Q9+FS 32Svr5vkWFlA/DmiO045GBHh2QLw0cB4H07ZGPVguvTOPLA36diddx98JiAAgE8caQF9+w T6YtEOdYBnqmUz4UQyyeoMS6PvcztsKO9HVfQJV6BJJe703AwOdEG0unGEHi1OsMgOZg1i xMacft+YDYTSQOOFAykCvPZw9xqiXWr/FGNUSSzuhv98XsH6SRUPznPI9pP3Ytv0AYAY2/ Yyarwsh/1OKQj5/I11S7LZDaVVKxXuzsUAzY4I8RNLFf+zPzsNUyngwqXO+5ug== 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=94.23.1.103; 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, RCVD_IN_MSPIKE_H2=-0.001, 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:273402 Archived-At: August 29, 2021 10:33 AM, "Drew DeVault" wrote:=0A=0A> Ar= e you sure you're rebasing in this scenario and not making merge=0A> comm= its? If you can come up with a series of git commands which=0A> reproduce= s this scenario, I would like to investigate further. Let's=0A> follow up= off-list.=0A=0A=0AI'll add it as a tangent here because others seemed to= chime in. You have to see this from the point of view of someone not use= d to git at all.=0A=0ARepo with double edits: =0Ahttps://git.sr.ht/~theo/= rebase/log=0A=0AOk, so what happens?=0A=0A1. Make some commits, push them= =0A2. Rebase your stuff locally, get this warning after:=0A```=0AOn branc= h master=0AYour branch and 'rebase/master' have diverged,=0Aand have 1 an= d 2 different commits each, respectively.=0A (use "git pull" to merge th= e remote branch into yours)=0A=0Anothing to commit, working tree clean=0A= ```=0A(A newcomer would read this as advice)=0A3. git pull=0A4. fix confl= icts if there are any=0A5. git add . && git commit, then save the file wi= th commit msg=0A6. git push=0A=0A=0AThen you end up with the state in tha= t repo. Timestamps are all over the place and things get hilarious real q= uick.=0A=0AI'd consider this a bug in git, though. That message is super = confusing.=0A=0AThis can happen in all sorts of workflows. And the fix is= n't "do it correctly", since it is so simple to get wrong. When other peo= ple add things to master branch while you work on your feature it gets ev= en worse.=0A=0AHope this helps=0A=0A--=0ATheo