From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Richard Stallman Newsgroups: gmane.emacs.devel Subject: Re: Re: Avoiding the three-windows merging with Git Date: Wed, 27 Nov 2019 01:45:50 -0500 Message-ID: References: <83sgmcskaw.fsf@gnu.org> <877e3n85ui.fsf@gmail.com> Reply-To: rms@gnu.org Content-Type: text/plain; charset=Utf-8 Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="82741"; mail-complaints-to="usenet@blaine.gmane.org" Cc: eliz@gnu.org, emacs-devel@gnu.org To: =?iso-8859-1?Q?K=C3=A9vin?= Le Gouguec Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Nov 27 07:47:44 2019 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1iZr71-000LO9-Po for ged-emacs-devel@m.gmane.org; Wed, 27 Nov 2019 07:47:43 +0100 Original-Received: from localhost ([::1]:34918 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZr70-0000Hg-3P for ged-emacs-devel@m.gmane.org; Wed, 27 Nov 2019 01:47:42 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:56008) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZr5F-0000D1-L4 for emacs-devel@gnu.org; Wed, 27 Nov 2019 01:45:54 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:44999) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iZr5F-0001kn-H6; Wed, 27 Nov 2019 01:45:53 -0500 Original-Received: from rms by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1iZr5C-0008Gk-8n; Wed, 27 Nov 2019 01:45:50 -0500 In-Reply-To: <877e3n85ui.fsf@gmail.com> (message from =?iso-8859-1?Q?K=C3?= =?iso-8859-1?Q?=A9vin?= Le Gouguec on Tue, 26 Nov 2019 08:16:53 +0100) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] 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.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:242772 Archived-At: [[[ To any NSA and FBI agents reading my email: please consider ]]] [[[ whether defending the US Constitution against all enemies, ]]] [[[ foreign or domestic, requires you to follow Snowden's example. ]]] > Attached is a silly script to create a conflict on a temporary > repository. The script creates 3 folders in the current directory: Does it operate purely locally? No connection to any remote site? -- Dr Richard Stallman Founder, Free Software Foundation (https://gnu.org, https://fsf.org) Internet Hall-of-Famer (https://internethalloffame.org)