From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.devel Subject: Re: Gitlab Migration Date: Mon, 30 Aug 2021 00:13:51 +0300 Message-ID: <5034507e-9241-3f12-5378-7771f3723db4@yandex.ru> References: <8d0be260-7b15-0b48-42e5-e5a4cc203e54@yandex.ru> <87k0k4hf39.fsf@gnus.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="31575"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 Cc: Philip Kaludercic , danflscr@gmail.com, theo@thornhill.no, emacs-devel@gnu.org, monnier@iro.umontreal.ca, Eli Zaretskii , Drew DeVault To: Lars Ingebrigtsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Aug 29 23:15:09 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 1mKS8z-000802-MX for ged-emacs-devel@m.gmane-mx.org; Sun, 29 Aug 2021 23:15:09 +0200 Original-Received: from localhost ([::1]:40918 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mKS8x-0001Qn-RV for ged-emacs-devel@m.gmane-mx.org; Sun, 29 Aug 2021 17:15:07 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:43188) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKS7p-0000Us-Ee for emacs-devel@gnu.org; Sun, 29 Aug 2021 17:13:57 -0400 Original-Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:46072) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mKS7n-0002cO-RR; Sun, 29 Aug 2021 17:13:57 -0400 Original-Received: by mail-wm1-x334.google.com with SMTP id j17-20020a05600c1c1100b002e754875260so8082896wms.4; Sun, 29 Aug 2021 14:13:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=/B1SCIrZMuVKZAkJEh+NGrxFE1Bjrwize5E9vxmnM08=; b=tBjDjgvGaTxh0wUyGSnravVMt0HYScVwogfolTJZY+p0Y1eDUVvTsWIP+ezsT10AbW /A7hDz8y9q4HeKhTixWZ07dpFP3m+WYwgjZ1m6XHf8Sm8Qn+9Lfy1/js+8Hg55b6pQSf mYUcYR7SAMGXN3KnPxDZy2FltFr3xqwqjgXTSBfonmyRwMk4Qzgd6pcGdqf0ruPQ9l0t FQeKYXpjQM3zySHjIL5MAK/DaKwJWLdL0GH/69Ndt3PLMJK+X+iULYaOnzDqrCDCgnqo cRtTxr86NRHnxBL8DcQlTY7iCCCHin+CxMfQdYLnFc2bU3KxlZ1S03ZeNeNOHN/rIcD5 FfJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:cc:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=/B1SCIrZMuVKZAkJEh+NGrxFE1Bjrwize5E9vxmnM08=; b=ekVFBoeXP49Puw+Oj2sym9U/VvoE/kKlcYgOnEjrZ4I82+h5teoBsD/5D+TKrLXMUA yS5/zBpJzuEyb65Yt7ZPrOJ42wQqGD8SvijECw6GEjx5mUZXEoWeiVNFTf80RoIzRuOU IpP4SFohO3KQn7qcbBEbcxUuHXXVJc4kqLdddzsgsvtjCLUjooTB8ioZWsmN+tO/F44u wSSSS0+CbhvcGgvkvDDlnDxiEKdOp/kbfvR66kUV4SzwaltDVb0dl/BKSGtm6CwTCqWe khYxHXnM97adj/BRMqtgPjp/iFNgTYQLm+MJWVAnYNq5vhPZkI7Ep14FjLc+FuVkyNiO 1lNA== X-Gm-Message-State: AOAM533PTsy+wIAuduHxC8ku1SHyynWkfiG60YestTL6NzGJR/B1aU5P 1m52EAGit5V6LfD4Il1c/79YLOEOWOw= X-Google-Smtp-Source: ABdhPJxzQjvlBHJKDwLOuSllaXXtk1f5OPjQaeVCLwkmV7XczioIme3UqQVQ9bw+nzixELiSuHUtwA== X-Received: by 2002:a05:600c:414f:: with SMTP id h15mr4979899wmm.124.1630271633680; Sun, 29 Aug 2021 14:13:53 -0700 (PDT) Original-Received: from [192.168.0.6] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id u2sm7561167wmj.29.2021.08.29.14.13.52 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 29 Aug 2021 14:13:53 -0700 (PDT) In-Reply-To: <87k0k4hf39.fsf@gnus.org> Content-Language: en-US Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=raaahh@gmail.com; helo=mail-wm1-x334.google.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_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, NICE_REPLY_A=-0.58, RCVD_IN_DNSWL_NONE=-0.0001, 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:273435 Archived-At: On 29.08.2021 10:42, Lars Ingebrigtsen wrote: > Dmitry Gutov writes: > >> - Rebasing. Some of our valued contributors are not 100% comfortable >> with the more advanced features of Git, rebasing included. Our >> general recommendation until now has been to prefer merge >> commits. > Well, one of the co-maintainers is sceptical towards rebasing, and the > other one uses it exclusively, so I don't think we currently have any > recommendation on the matter. Whenever a question arose about a recommended workflow from someone who claims not to understand Git well, the recommendation always came in the form "use merges, not rebase". Which is a good suggestion, I think. A well-done rebase is indistinguishable from a "normal" branch, so of course there is no point in prohibiting their use.