From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: phillip.lord@russet.org.uk (Phillip Lord) Newsgroups: gmane.emacs.devel Subject: Branches are Scary Date: Thu, 17 Dec 2015 21:25:35 +0000 Message-ID: <87bn9oydgw.fsf@russet.org.uk> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1450387568 24585 80.91.229.3 (17 Dec 2015 21:26:08 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 17 Dec 2015 21:26:08 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Dec 17 22:25:55 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 1a9g3e-0008Fk-Mb for ged-emacs-devel@m.gmane.org; Thu, 17 Dec 2015 22:25:55 +0100 Original-Received: from localhost ([::1]:57265 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9g3e-00022t-5r for ged-emacs-devel@m.gmane.org; Thu, 17 Dec 2015 16:25:54 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56551) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9g3R-00022g-9N for emacs-devel@gnu.org; Thu, 17 Dec 2015 16:25:42 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a9g3O-0003wR-3W for emacs-devel@gnu.org; Thu, 17 Dec 2015 16:25:41 -0500 Original-Received: from cheviot22.ncl.ac.uk ([128.240.234.22]:55024) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9g3N-0003wK-JC for emacs-devel@gnu.org; Thu, 17 Dec 2015 16:25:37 -0500 Original-Received: from smtpauth-vm.ncl.ac.uk ([10.8.233.129] helo=smtpauth.ncl.ac.uk) by cheviot22.ncl.ac.uk with esmtp (Exim 4.63) (envelope-from ) id 1a9g3M-0005Pz-FQ for emacs-devel@gnu.org; Thu, 17 Dec 2015 21:25:36 +0000 Original-Received: from cpc6-benw10-2-0-cust45.gate.cable.virginm.net ([92.238.179.46] helo=localhost) by smtpauth.ncl.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.63) (envelope-from ) id 1a9g3M-0008W9-LY for emacs-devel@gnu.org; Thu, 17 Dec 2015 21:25:36 +0000 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 128.240.234.22 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:196432 Archived-At: I was wondering if anyone could describe the git setup wrt to branches on the main Emacs git. 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. 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. 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? Phil