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: Mon, 30 Aug 2021 08:31:53 +0200 Message-ID: References: <8d0be260-7b15-0b48-42e5-e5a4cc203e54@yandex.ru> <837dg4n1ix.fsf@gnu.org> <45ab6f2a-07de-3f27-34d6-7fb52f6ac6ba@yandex.ru> 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="32523"; mail-complaints-to="usenet@ciao.gmane.io" Cc: philipk@posteo.net, danflscr@gmail.com, theo@thornhill.no, emacs-devel@gnu.org, monnier@iro.umontreal.ca, larsi@gnus.org To: "Dmitry Gutov" , "Eli Zaretskii" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Mon Aug 30 09:08:32 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 1mKbPD-0008FS-V3 for ged-emacs-devel@m.gmane-mx.org; Mon, 30 Aug 2021 09:08:32 +0200 Original-Received: from localhost ([::1]:57832 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mKbPC-0004O7-VA for ged-emacs-devel@m.gmane-mx.org; Mon, 30 Aug 2021 03:08:30 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:47512) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKapt-0001ky-8R for emacs-devel@gnu.org; Mon, 30 Aug 2021 02:32:01 -0400 Original-Received: from out0.migadu.com ([2001:41d0:2:267::]:19763) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKapo-0004fP-I7; Mon, 30 Aug 2021 02:32:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpwn.com; s=key1; t=1630305113; 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=snEacUXtf5dhJbhnBZ14jnxp4UeCabPs8n0qUa9rwd8=; b=U3R/N/mo+Jf4Vsl4OEwfCrqnTdls+5MOgSSDYcAzG374ZYJatl4sEHtJ+YFuumJ43AeeC1 ky8W9VJaGjJxOXNIb/teDhyyWhF81KKZtv7UFFCfeAv/IPYQw2m6lNSKdJVTjftpJIfwol /0V81VQNZHzCLVYMtPaZz6XK0sUbMfl14GBQZip22URUYB2ky5pqBfXqW5kz81awJ+8LqJ OREJ90cLfkwHKsW55G4eckgXQ9uNHerFIm5gafazXyAf0xKtTndwbtPPrVSKsa961bMLRW ON3U/6NNXqs2JrbQAN5LDCucPwNwp7O7UT4bsGDA7pBuSlLiTMoWHYc9e4Bulg== X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. In-Reply-To: <45ab6f2a-07de-3f27-34d6-7fb52f6ac6ba@yandex.ru> X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: sir@cmpwn.com Received-SPF: pass client-ip=2001:41d0:2:267::; envelope-from=sir@cmpwn.com; 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:273466 Archived-At: On Mon Aug 30, 2021 at 12:27 AM CEST, Dmitry Gutov wrote: > When you say it's not a requirement, how does the alternative work? > > Suppose I have a feature branch scratch/exciting-new-feature. > > And it has a number of existing commits A, B, C, where I did some work > on said feature. > > Then I do a merge from master, creating a merge commit M which resolves > a conflict. It also pulls commits M1 and M2 from master into the branch, > both of which have a later creation date than A. > > Then I add commits D and E with some subsequent work. Honestly, by doing this you have created a poor git history which I, as a maintainer, would not care to review, be it via email or any other means including the GitHub workflow. I would teach you how to rebase it properly instead of accepting this work, and I think that emacs would be wise to do the same. However, you can still work with this on sourcehut by using git request-pull(1): https://www.git-scm.com/docs/git-request-pull There is no UI for this, but it is planned.