From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: =?utf-8?Q?K=C3=A9vin_Le_Gouguec?= Newsgroups: gmane.emacs.devel Subject: Re: Avoiding the three-windows merging with Git Date: Wed, 27 Nov 2019 21:15:38 +0100 Message-ID: <87blsx9itx.fsf@gmail.com> References: <83sgmcskaw.fsf@gnu.org> <877e3n85ui.fsf@gmail.com> <87a78hu08f.fsf@mbork.pl> 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="54118"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: eliz@gnu.org, rms@gnu.org, emacs-devel@gnu.org To: Marcin Borkowski Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Nov 27 21:15:56 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 1ia3jA-000Dwt-Bc for ged-emacs-devel@m.gmane.org; Wed, 27 Nov 2019 21:15:56 +0100 Original-Received: from localhost ([::1]:42992 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ia3j9-0002ik-3T for ged-emacs-devel@m.gmane.org; Wed, 27 Nov 2019 15:15:55 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:41029) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ia3j1-0002em-NF for emacs-devel@gnu.org; Wed, 27 Nov 2019 15:15:48 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ia3ix-00069R-9F for emacs-devel@gnu.org; Wed, 27 Nov 2019 15:15:47 -0500 Original-Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:52908) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ia3ix-00062r-2n; Wed, 27 Nov 2019 15:15:43 -0500 Original-Received: by mail-wm1-x334.google.com with SMTP id l1so8503209wme.2; Wed, 27 Nov 2019 12:15:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=Qy54sLjUqGpiUwBA9DxM4fAEuuC9iw81MW5BjgETizI=; b=ipvyJ/Grc2XZxzLpW6bZj/MBghB6QaZahhRZhBP/xeS3stoa8j7LqfKIlTDnXtSGdv 7VJQ2/+8oDql5OnQMYjHU6L2MHScbfpJ/zAL7yUV0rG/4eVdTMzyxeeTcWUnSzzSFG5m 490yx4W6OzcFOMary6XTqXoxmTA6onzBNGBKcvlklIAq9g4zakAV8o7oQlqDVxgPTL7h kYyKVZG/EaqT0471UPvWm/8earW5joYdsU5v8bzqUxukiqojenfl9ohtIyLRy/Tdte7M 8ul90C0LAZ88gpE4t5TWrgHgDwgex/ZPhJay1rnwqlWb6uL+xz+k1ZEyNTfwSCt+Alkp CNfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=Qy54sLjUqGpiUwBA9DxM4fAEuuC9iw81MW5BjgETizI=; b=VAFTet7AWgcDPgw3gYWEwf9eX3R6JQkkZBqLnDuxBEMfS+izI/XT68K7AuYcSQbUA9 ap94DVTH3uzhil1EIXlibBivFN6fHVQ9u3KmeO6f/IgMLlgej75l1rCnv+10IDPPpzMU WycM8mDC7dhaSko4MpDt77GApG7Ht3Z56gYfpj0YuF5IJt3tU6zgF9bQjyJ2Kde1jVb1 68CtNNwmXcwHSFK/78jrU2ixt+st7NlFrdyew0ngqaFa0pQQtTYcvxdc3/DqgIbhjEn/ 0gDf4ibnUD24M/vVo8VcrQB4A2ADQYXQLiTRVzZ6Fehh9K/onQuKcLsBZxVIMOi8VMVm gfYQ== X-Gm-Message-State: APjAAAUIWsXOg06FKTHv9iu+oV6KK7oxu5x03lzVpRqwnQWB7kKIPzs0 ZSpdLq2qc/nP+12SfRTIf7saKXsvEuE= X-Google-Smtp-Source: APXvYqwpp6x+xKZql31ZBke+fSHH6kCAgBGXewpPLGRi1coi9Dfub4C9NNVrOLEwMwsh7pTb6MuuJQ== X-Received: by 2002:a1c:a5c2:: with SMTP id o185mr5844640wme.35.1574885739970; Wed, 27 Nov 2019 12:15:39 -0800 (PST) Original-Received: from little-buster (200.143.13.109.rev.sfr.net. [109.13.143.200]) by smtp.gmail.com with ESMTPSA id u135sm2528684wmu.20.2019.11.27.12.15.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Nov 2019 12:15:39 -0800 (PST) In-Reply-To: <87a78hu08f.fsf@mbork.pl> (Marcin Borkowski's message of "Wed, 27 Nov 2019 10:39:28 +0100") X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::334 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:242807 Archived-At: 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 :) > 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)