From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Branches are Scary Date: Fri, 18 Dec 2015 09:20:43 +0200 Message-ID: <83mvt8xlx0.fsf@gnu.org> References: <87bn9oydgw.fsf@russet.org.uk> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1450423250 31339 80.91.229.3 (18 Dec 2015 07:20:50 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 18 Dec 2015 07:20:50 +0000 (UTC) Cc: emacs-devel@gnu.org To: phillip.lord@russet.org.uk (Phillip Lord) Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Dec 18 08:20:45 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1a9pLI-000427-IV for ged-emacs-devel@m.gmane.org; Fri, 18 Dec 2015 08:20:44 +0100 Original-Received: from localhost ([::1]:58736 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9pLH-0003gT-Vd for ged-emacs-devel@m.gmane.org; Fri, 18 Dec 2015 02:20:43 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57886) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9pKy-0003gA-EI for emacs-devel@gnu.org; Fri, 18 Dec 2015 02:20:25 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a9pKv-0001Qi-0f for emacs-devel@gnu.org; Fri, 18 Dec 2015 02:20:24 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:50851) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9pKu-0001Qe-TV; Fri, 18 Dec 2015 02:20:20 -0500 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:1695 helo=HOME-C4E4A596F7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1a9pKu-0005Qs-9l; Fri, 18 Dec 2015 02:20:20 -0500 In-reply-to: <87bn9oydgw.fsf@russet.org.uk> (phillip.lord@russet.org.uk) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 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.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:196451 Archived-At: > From: phillip.lord@russet.org.uk (Phillip Lord) > Date: Thu, 17 Dec 2015 21:25:35 +0000 > > I was wondering if anyone could describe the git setup wrt to branches > on the main Emacs git. There's no setup I could think of. There are official branches where development of to-be-released versions is going on, and there are all the other branches people push to let others try experimental features. > I always find deleting branches (that I have created) rather an unhappy > experience, as I worry that I will do the wrong thing, and accidentally > delete emacs-25. If you are afraid of deleting branches, don't. Someone else will come and do it eventually. > At the same time, if I am understanding things correctly, I can't squash > and force feature and fix branches that I have pushed up, which means > that these have to get deleted unmerged cause I squash and merge locally. Public branches are public branches; don't do there anything that will cause pain to people who might track them. > Perhaps I am worried about this unnecessarily. Can I delete emacs-25 or > master by mistake? And, at the same time, is it possible to squash > things in other branches? I suggest to refrain from squashing on public branches. Why do you need it?