Re: IETF Git and GitHub tutorial

Michael Richardson <mcr@sandelman.ca> Fri, 11 October 2019 20:25 UTC

Return-Path: <mcr@sandelman.ca>
X-Original-To: wgchairs@ietfa.amsl.com
Delivered-To: wgchairs@ietfa.amsl.com
Received: from localhost (localhost [127.0.0.1]) by ietfa.amsl.com (Postfix) with ESMTP id 6148412006E for <wgchairs@ietfa.amsl.com>; Fri, 11 Oct 2019 13:25:52 -0700 (PDT)
X-Virus-Scanned: amavisd-new at amsl.com
X-Spam-Flag: NO
X-Spam-Score: 1.435
X-Spam-Level: *
X-Spam-Status: No, score=1.435 tagged_above=-999 required=5 tests=[BAYES_00=-1.9, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001] autolearn=no autolearn_force=no
Received: from mail.ietf.org ([4.31.198.44]) by localhost (ietfa.amsl.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Ez1JXfHRW-7a for <wgchairs@ietfa.amsl.com>; Fri, 11 Oct 2019 13:25:51 -0700 (PDT)
Received: from relay.sandelman.ca (relay.cooperix.net [IPv6:2a01:7e00::f03c:91ff:feae:de77]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ietfa.amsl.com (Postfix) with ESMTPS id ECB1412002E for <wgchairs@ietf.org>; Fri, 11 Oct 2019 13:25:50 -0700 (PDT)
Received: from dooku.sandelman.ca (214-137-20-31.ftth.glasoperator.nl [31.20.137.214]) by relay.sandelman.ca (Postfix) with ESMTPS id 30CB91F456; Fri, 11 Oct 2019 20:25:49 +0000 (UTC)
Received: by dooku.sandelman.ca (Postfix, from userid 179) id 704803500; Fri, 11 Oct 2019 22:26:36 +0200 (CEST)
From: Michael Richardson <mcr@sandelman.ca>
To: "Salz, Rich" <rsalz@akamai.com>
cc: IETF WG Chairs <wgchairs@ietf.org>
Subject: Re: IETF Git and GitHub tutorial
In-reply-to: <4FDDF67C-0E50-43C1-A067-DB4FBD5F453B@akamai.com>
References: <3b3a2e43-3a37-44d8-9967-920d2f977e42@www.fastmail.com> <CADZyTk=7fN+i7H1AX+T7fW3OOQGUAd7z0mtGAeUnpr2O5vZsKA@mail.gmail.com> <CADZyTkkku5y8a1HURp6uQ447eq_dn5wzhwPxhqrpvg1U4dHctQ@mail.gmail.com> <9338.1570802815@dooku.sandelman.ca> <4FDDF67C-0E50-43C1-A067-DB4FBD5F453B@akamai.com>
Comments: In-reply-to "Salz, Rich" <rsalz@akamai.com> message dated "Fri, 11 Oct 2019 16:00:52 -0000."
X-Mailer: MH-E 8.6; nmh 1.6; GNU Emacs 24.5.1
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-="; micalg="pgp-sha256"; protocol="application/pgp-signature"
Date: Fri, 11 Oct 2019 22:26:36 +0200
Message-ID: <23331.1570825596@dooku.sandelman.ca>
Archived-At: <https://mailarchive.ietf.org/arch/msg/wgchairs/mfrrL82vL9zCbGoEdtdMPkki4-I>
X-BeenThere: wgchairs@ietf.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Working Group Chairs <wgchairs.ietf.org>
List-Unsubscribe: <https://www.ietf.org/mailman/options/wgchairs>, <mailto:wgchairs-request@ietf.org?subject=unsubscribe>
List-Archive: <https://mailarchive.ietf.org/arch/browse/wgchairs/>
List-Post: <mailto:wgchairs@ietf.org>
List-Help: <mailto:wgchairs-request@ietf.org?subject=help>
List-Subscribe: <https://www.ietf.org/mailman/listinfo/wgchairs>, <mailto:wgchairs-request@ietf.org?subject=subscribe>
X-List-Received-Date: Fri, 11 Oct 2019 20:25:52 -0000

Salz, Rich <rsalz@akamai.com> wrote:
    >> And there is a serious limitation, which is that it pretty much
    >> impossible to rebase with only the web interface, so after having
    >submitted an edit, once it is accepted, one winds up with a tree (fork) you can not use again.
  
    > The work-around is simple and probably follows what most people do,
    > anyway: do not re-use a branch name for different items of
    > work. (Arguably that's an implied git best practice.) In fact, GitHub
    > pull requests use the branch name, so I would not be surprised if doing
    > this (which you shouldn't) can lead to problems anyway.

In order words, you have to know how to create a branch.
While helping some other newbies to git (who were on windows 10, and could
barely use a shell), when they use the crayon icon to edit/send-pull-request
it always forked to their account, and then used a branch "master".

At which point, we had no idea how to update what was in their account
without a shell.

-- 
]               Never tell me the odds!                 | ipv6 mesh networks [ 
]   Michael Richardson, Sandelman Software Works        | network architect  [ 
]     mcr@sandelman.ca  http://www.sandelman.ca/        |   ruby on rails    [