[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Avoiding the three-windows merging with Git
|
From: |
Marcin Borkowski |
|
Subject: |
Re: Avoiding the three-windows merging with Git |
|
Date: |
Wed, 27 Nov 2019 10:39:28 +0100 |
|
User-agent: |
mu4e 1.1.0; emacs 27.0.50 |
On 2019-11-27, at 07:45, Richard Stallman <address@hidden> wrote:
> [[[ 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?
Why should it connect to any remote site? Besides, Kévin said
explicitly that it operates in the _current directory_, and a cursory
scan of the script confirms that.
In fact, it would be probably even simpler to use branches instead of
clones for creating artificial conflicts like this.
Best,
--
Marcin Borkowski
http://mbork.pl