From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id YJHaLkBUn2RxbAEASxT56A (envelope-from ) for ; Sat, 01 Jul 2023 00:16:32 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id iDfaLkBUn2R16AAA9RJhRA (envelope-from ) for ; Sat, 01 Jul 2023 00:16:32 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 65A0C2A38A for ; Sat, 1 Jul 2023 00:16:31 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=GrWiddYE; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1688163392; a=rsa-sha256; cv=none; b=rIsjDrAIhbHK4inW6PqcXBlL006nHkEH1YxeHDeD6+63pKAOFVI+DvWy9n+O9tj4+aoDNn 30vtdPFbcpDA3xd/2tOb90ujZ+pvYcMpKwA+wOgK8W41xszb9w36vQ/Y+ZSbZtyJZl8RxG mtfiDUr4+pYUPVLbDwUVoTvTjWDUe4vU5gWVPUkaMhdE9x0aTC1q8bZN+UexH6ehTEwfgE JtTxu4jmK5UI3sfcuOGkTC8RhoX8MOq6BFhzl9DmYpkWYbszIAt5z4F+4OMwOKnrY8Qz24 OyX88gJ0aiaIsklinXrOP58MoB4PQt9STy9D+g8HDaZyAlOC/YTWuCcbJHBqow== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=GrWiddYE; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1688163392; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=dgQv/2eoR/2XYjNrNKUMvp64H8N0nGaaqSEAlLP9LIo=; b=gYfWiTG+T/Sg+Au6JuxRwpM010GinXjGF98aTsClBcgTKNrwbvx8aRdRaJaENw8msugysH ZgMOzIwK45SJu/5GAPUywXvpzpNtQVEYgAMav/2JBNuSQK7+tHZ28J6e/VG3Ir6xhRLbnC ulz3NUmYMiVQ3mDRZIiTMbFc9ykRAjgxC93tM3dQORmzcMu2yRxQV54laYLTxg4jtLGeqv rAF2p6kVrN/FzeXV42DThQ67GE9DKIHMRC12xFZF/fOly870j9Mw1oWMc6ZTvVpcwtdtge EmX7B2yaYaIQzHfLx4eceFGqsYjB/5IDM/Rm1ZPBidW7ewH055dAxE8CkO/fQA== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qFMOt-0004Zu-RS; Fri, 30 Jun 2023 18:15:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qFMOr-0004Zl-Tz for emacs-orgmode@gnu.org; Fri, 30 Jun 2023 18:15:33 -0400 Received: from mail-lf1-x12d.google.com ([2a00:1450:4864:20::12d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qFMOq-0005Oy-2a for emacs-orgmode@gnu.org; Fri, 30 Jun 2023 18:15:33 -0400 Received: by mail-lf1-x12d.google.com with SMTP id 2adb3069b0e04-4fb91513b1bso682330e87.0 for ; Fri, 30 Jun 2023 15:15:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688163330; x=1690755330; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=dgQv/2eoR/2XYjNrNKUMvp64H8N0nGaaqSEAlLP9LIo=; b=GrWiddYEEBeR02peTgw02UGx8/OwaBSK+6nDn4afHJA6EpyJ9W88DYaOHMCZTq9BDq YodTkuhH3IPXXZi10v2NXkmiyZMPtsMAh7ZYGlR8HI3+uDg2yyW/8X5PO9wxA7rs334m D+eLXkyXz9uHkm4fVgTkWN9qe4VoiXYhZRQLt/P2bqS+j8XTBuh4vTMDXDNO23Z60f+j J67LU8d8hNxduwh8gjuY/wlsXosQ7rwJPIGx7/9f1CxvotQrzJbtsrw4AUA5auRaGZY1 sqNhFPugxTUC9qyYO44Ab8NUJyZ38EM8urjIeM3qCZpMr6QyK3Y4QGRumSQIdy1dkXiL dcCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688163330; x=1690755330; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=dgQv/2eoR/2XYjNrNKUMvp64H8N0nGaaqSEAlLP9LIo=; b=CLpe+vo3MswC5/JmEHrYFQLWrilUHttWPy6UipjttaugOMFdV6x6bOrF+0r9lWl0ES NsfCzoY+zvMlkofpjVFPpEuHtZDMm3BisZMfr+C6SdoT6m9Cxzu1+dK1G7jrA0+Zqp5A HFljwv0sQ6nZiSfKPcBtWS9Tb553T2JNej23feDBr4rSQaWitMRIHhLCrevHjkYgCpUu xh1buDCBb5urmf2DwuEne+7rWQYPOBqRODP6KS/ylCjkO+sNoNpP0fK4Y3OScxGk88Bs MFbyN50Kr8/xEACxpFKfWzPzrAgmwEfKiaOErXbkfG8HvZLWILVi2BApHoFyXwaEnlnQ eM3Q== X-Gm-Message-State: ABy/qLYnwUi120wsES3VRt93ga76GuaejSpkQd9km3/myV3Zc1bOiLUe lGVXu1Mx6138gNPSfcUo7SUNCiDyzeiGA7q30AGtAUJHXjp8pQ== X-Google-Smtp-Source: APBJJlG7VMsUmrZ0nnNcLQNWvk0ViH6luuZv736+kXVnijP9YJojnjqYDipIVYBEfBmGtHcz+o4L49JeOIOXjmiwZYU= X-Received: by 2002:a19:7601:0:b0:4fb:9477:f713 with SMTP id c1-20020a197601000000b004fb9477f713mr2142186lff.6.1688163329807; Fri, 30 Jun 2023 15:15:29 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:aa6:c54b:0:b0:268:94be:fdc7 with HTTP; Fri, 30 Jun 2023 15:15:28 -0700 (PDT) In-Reply-To: References: From: Samuel Wales Date: Fri, 30 Jun 2023 15:15:28 -0700 Message-ID: Subject: Re: basic git To: Max Nikulin Cc: emacs-orgmode@gnu.org Content-Type: text/plain; charset="UTF-8" Received-SPF: pass client-ip=2a00:1450:4864:20::12d; envelope-from=samologist@gmail.com; helo=mail-lf1-x12d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: emacs-orgmode-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -4.92 X-Migadu-Queue-Id: 65A0C2A38A X-Spam-Score: -4.92 X-TUID: DQgAG0U2ASdd On 6/30/23, Max Nikulin wrote: > On 30/06/2023 13:55, Samuel Wales wrote: >> the merge conflict is >> >> <<<<<<< HEAD >> ;; Version: 9.7-pre >> ======= >> ;; Version: 9.6.7 >>>>>>>>> 7da765e459384f68d764589c94fd26472f1c3361 > > It looks like you tried to merge into the "bugfix" branch the "main" > branch. i had no idea. > > Do you have history of last git commands, e.g. in an emacs eshell > buffer? Please, post them. would rather forget the trauma. but there is amusement value to be had by onlookers so here goes. hehe you get to see all my git ignorance and try to wonder at what my scritps do. 502 ado git-pullv # says what's new etc. 503 git branch --set-upstream-to=origin/bugfix bugfix #i was told to do this. it worked ok before. but now it tells me i have to do something. 504 cd $delbig 505 cd 9bugfix #symlink 506 git status 507 ado git-pullv 508 git pull 509 git fetch --tags origin #desperation sets in 510 git status 511 ado git-pullv # this is the !@#$ it moment. should work for sure. ha ha. 512 git clone https://git.savannah.gnu.org/git/emacs/org-mode.git 513 mv org-mode ../new 514 cd .. 515 mv org-mode--vanilla-bugfix--ok-to-pull--xyzzy-nomost ../obsolescent--xyzzy-nomost/ 516 mv new org-mode--vanilla-bugfix--ok-to-pull--xyzzy-nomost 517 cd org-mode--vanilla-bugfix--ok-to-pull--xyzzy-nomost 518 git status 519 git gc 520 git status 521 git branch bugfix 522 git status 523 git branch 524 git checkout bugfix 525 git status 526 ado git-pullv 527 ado diffoldnew cat .git/config 528 git branch --set-upstream-to=origin/bugfix bugfix 529 ado diffoldnew cat .git/config #so i can s3ee what git does with its inscrutably seemingly suddenly needed command 530 git status 531 git pullv 532 ado git-pullv 533 git fetch 534 git merge --force #flailing around 535 git status 536 git pull 537 git pull --theirs #i just want upstream 538 git status 539 git merge --abort #well it said i could didn't it? 540 git status 541 git pull --their 542 git --theirs pull 543 git pull --theirs 544 git branch 545 git branch asdfasdf 546 git branch 547 git branch -d associated 548 git branch -d asdfasdf 549 git branch #ok i get that it doesn't change branches by now 553 u;eagenda 554 lt 555 cd /tmp 556 git clone https://git.savannah.gnu.org/git/emacs/org-mode.git #try again, as i did all that weird wrong stuff 557 cd org-mode 558 ,git branch -a 559 git branch -a 560 git checkout bugfix 561 git branch -a 562 git pull 563 git pull origin bugfix 564 cd .. 565 pd 566 cd $delbit 567 lt 568 cd $delbig 569 lt 570 rmg org-mode--vanilla-bugfix--ok-to-pull--xyzzy-nomost 571 mv /tmp/org-mode org-mode--vanilla-bugfix--ok-to-pull--xyzzy-nomost 572 cd org-mode--vanilla-bugfix--ok-to-pull--xyzzy-nomost 573 git status 574 ado git-pullv # ok it works > Git is a flexible and powerful tool. cannot disagree but also it is one which is too much for me most of the time given my cognitive decline. i try to stick to the basics and it throws me into stress territory when even just blowing away the existing and cloning doesn't work. sticking to the basics /usually/ works. yeah, it's a dag, you checkout stuff, you avoid fancy stuff like plutonium. actiually it can have muluple roots but never mind that. git is like they say about war. boredom punctuated by terror. -- The Kafka Pandemic A blog about science, health, human rights, and misopathy: https://thekafkapandemic.blogspot.com