From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Marcin Borkowski Newsgroups: gmane.emacs.devel Subject: Re: Avoiding the three-windows merging with Git Date: Wed, 27 Nov 2019 23:48:00 +0100 Message-ID: <87y2w1rl5r.fsf@mbork.pl> References: <83sgmcskaw.fsf@gnu.org> <877e3n85ui.fsf@gmail.com> <87a78hu08f.fsf@mbork.pl> <87blsx9itx.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="196805"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: mu4e 1.1.0; emacs 27.0.50 Cc: eliz@gnu.org, rms@gnu.org, emacs-devel@gnu.org To: =?utf-8?Q?K=C3=A9vin?= Le Gouguec Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Nov 27 23:49:16 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 1ia67Y-000p1y-63 for ged-emacs-devel@m.gmane.org; Wed, 27 Nov 2019 23:49:16 +0100 Original-Received: from localhost ([::1]:43906 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ia67W-0006sT-Er for ged-emacs-devel@m.gmane.org; Wed, 27 Nov 2019 17:49:14 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:38367) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ia66n-0006sH-8a for emacs-devel@gnu.org; Wed, 27 Nov 2019 17:48:30 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ia66k-0000La-UE for emacs-devel@gnu.org; Wed, 27 Nov 2019 17:48:28 -0500 Original-Received: from mail.mojserwer.eu ([195.110.48.8]:50130) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ia66g-0000B0-GM; Wed, 27 Nov 2019 17:48:22 -0500 Original-Received: from localhost (localhost [127.0.0.1]) by mail.mojserwer.eu (Postfix) with ESMTP id EBF63E6CC1; Wed, 27 Nov 2019 23:48:18 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail.mojserwer.eu Original-Received: from mail.mojserwer.eu ([127.0.0.1]) by localhost (mail.mojserwer.eu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6VWa5dqL_J7a; Wed, 27 Nov 2019 23:48:06 +0100 (CET) Original-Received: from localhost (jeden09-dwa27.echostar.pl [213.156.109.227]) by mail.mojserwer.eu (Postfix) with ESMTPSA id B9213E65AA; Wed, 27 Nov 2019 23:48:06 +0100 (CET) In-reply-to: <87blsx9itx.fsf@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 195.110.48.8 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:242812 Archived-At: On 2019-11-27, at 21:15, K=C3=A9vin Le Gouguec = wrote: > Marcin Borkowski writes: > >> Why should it connect to any remote site? > > To be fair, cloning/fetching/pushing from/to local repos is not a > feature I've seen advertised often, though obviously it's All There In > The Manual :) Fair enough. OTOH, I came to Git from (early) Mercurial, where creating local clones was a standard way of doing branches. Also, I sometimes create local clones to perform experiments with Git. (There is another, not very well known feature of Git called "worktrees", which is kind of similar. Basically, worktrees allow one to have several working directories, all corresponding to a single .git directory.) >> In fact, it would be probably even simpler to use branches instead of >> clones for creating artificial conflicts like this. > > Sure, that is a rather heavy-handed way to create conflicts. > > What I like about this setup is that it allows someone unfamiliar with > Git "remotes" to experiment locally, either to learn the basics of the > push-pull-whoops-conflict workflow, or to tinker with more advanced > stuff (server hooks, being on the wrong end of git push --force=E2=80=A6) Good point. (BTW, a few months ago I studied a nice online course on Git, which used exactly this approach to teach remotes.) Best, -- Marcin Borkowski http://mbork.pl