From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail
From: Eli Zaretskii <eliz@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: Avoiding the three-windows merging with Git
Date: Wed, 27 Nov 2019 17:45:42 +0200
Message-ID: <83eextqq55.fsf@gnu.org>
References: <E1iZ4pX-0004rT-Ms@fencepost.gnu.org> <83sgmcskaw.fsf@gnu.org>
 <E1iZRoN-0000cW-RE@fencepost.gnu.org> <877e3n85ui.fsf@gmail.com>
 <E1iZr5C-0008Gk-8n@fencepost.gnu.org>
Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226";
	logging-data="243377"; mail-complaints-to="usenet@blaine.gmane.org"
Cc: emacs-devel@gnu.org, kevin.legouguec@gmail.com
To: rms@gnu.org
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Nov 27 16:47:38 2019
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
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 <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1iZzXW-0011Dy-7o
	for ged-emacs-devel@m.gmane.org; Wed, 27 Nov 2019 16:47:38 +0100
Original-Received: from localhost ([::1]:39732 helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1iZzXV-0005lI-1G
	for ged-emacs-devel@m.gmane.org; Wed, 27 Nov 2019 10:47:37 -0500
Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:53313)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <eliz@gnu.org>) id 1iZzVg-0004xV-HK
 for emacs-devel@gnu.org; Wed, 27 Nov 2019 10:45:46 -0500
Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:52121)
 by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <eliz@gnu.org>)
 id 1iZzVg-0000Q5-8B; Wed, 27 Nov 2019 10:45:44 -0500
Original-Received: from [176.228.60.248] (port=1413 helo=home-c4e4a596f7)
 by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256)
 (Exim 4.82) (envelope-from <eliz@gnu.org>)
 id 1iZzVV-00055i-58; Wed, 27 Nov 2019 10:45:33 -0500
In-reply-to: <E1iZr5C-0008Gk-8n@fencepost.gnu.org> (message from Richard
 Stallman on Wed, 27 Nov 2019 01:45:50 -0500)
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." <emacs-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-devel>,
 <mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-devel>,
 <mailto:emacs-devel-request@gnu.org?subject=subscribe>
Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Original-Sender: "Emacs-devel" <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
Xref: news.gmane.org gmane.emacs.devel:242795
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/242795>

> From: Richard Stallman <rms@gnu.org>
> Cc: eliz@gnu.org, emacs-devel@gnu.org
> Date: Wed, 27 Nov 2019 01:45:50 -0500
> 
>   > 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?

Yes, it arranges for the upstream repository to be on your local
machine, just in another directory.