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 21:50:43 +0200 Message-ID: <11F70ECD-4F32-42EE-9682-A735AF737551@thornhill.no> References: <8d0be260-7b15-0b48-42e5-e5a4cc203e54@yandex.ru> <837dg4n1ix.fsf@gnu.org> <834kb8mzk1.fsf@gnu.org> <1ed3f32a6594bd1591d2c359c748846e@thornhill.no> <87bl5g9icg.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="8848"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Drew DeVault , Eli Zaretskii , dgutov@yandex.ru, larsi@gnus.org, danflscr@gmail.com, philipk@posteo.net, monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Tassilo Horn Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Aug 29 21:52:10 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 1mKQqe-00028N-Vg for ged-emacs-devel@m.gmane-mx.org; Sun, 29 Aug 2021 21:52:10 +0200 Original-Received: from localhost ([::1]:53880 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mKQqd-0005F1-OZ for ged-emacs-devel@m.gmane-mx.org; Sun, 29 Aug 2021 15:52:07 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:33062) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKQpU-0003TN-Ak for emacs-devel@gnu.org; Sun, 29 Aug 2021 15:50:56 -0400 Original-Received: from out0.migadu.com ([94.23.1.103]:20658) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKQpQ-0005Sp-E6; Sun, 29 Aug 2021 15:50:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=thornhill.no; s=key1; t=1630266647; 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=iis9k1v9dpdNi7K8fYvjFm/Q33yukv1/PJFIFDGF/1I=; b=ypCideF+tCXnXGkZiDkZfmrKAHicAWn1XNW/KpkbSfuvpWk/6ac2+ljeEWqFNU2GTpeOYC VMfzGaz1m9oOfuRoD2SHpSNSUni8PXflXyIB5JUfy126xwJ5Ns4TA/SPrPxv/S9jlAbknL c4vNm235pCE14WLDcHnjP6GmdCaWAFukOe4pHxWjfCTG9UY7x147NHMuxf2cZv0/B9+x42 rKdWL9jnmKWZDpwfscISgpIVYOAq223sP2aUnoaw7EBRrMPfvB+mFtqkhLCBXyZGk6JvZ/ biGmzlnhDRbCorN3CDOv/y2NR94TENy4SM+Sk0HLx1KlN0pUuOhu5rKmQjBlQw== X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. In-Reply-To: <87bl5g9icg.fsf@gnu.org> 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:273432 Archived-At: On 29 August 2021 21:03:45 CEST, Tassilo Horn wrote: >theo@thornhill=2Eno writes: > >Hi Theo, > >> Repo with double edits:=20 >> https://git=2Esr=2Eht/~theo/rebase/log >> >> Ok, so what happens? >> >> 1=2E Make some commits, push them >> 2=2E Rebase your stuff locally, get this warning after: > >Well, looking at "git log --graph" of your repo, I'm pretty sure you >ended there because in step 2 you rebased commits which you had already >pushed and later merged the upstream branch with the locally rebased >one=2E Rebasing commits which are already pushed is a no-go unless you >are working in your private branch=2E > Yeah, absolutely=2E Thing is these things happen to people and are possibl= y why people find git hard=2E At least when your gui hides the fact that gi= t pull is fetch and merge behind a +button, or something like that=2E And this is also a way to get duplicated commits without doing very compli= cated footgun things=2E Git itself hands you the gun in this case=2E Theo