From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id mMu7A4d8nmSudgEASxT56A (envelope-from ) for ; Fri, 30 Jun 2023 08:56:07 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id YJm3A4d8nmTXHgAA9RJhRA (envelope-from ) for ; Fri, 30 Jun 2023 08:56:07 +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 C33E32C69E for ; Fri, 30 Jun 2023 08:56:06 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qF82G-0003As-L5; Fri, 30 Jun 2023 02:55:16 -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 1qF82D-0003AL-Mq for emacs-orgmode@gnu.org; Fri, 30 Jun 2023 02:55:13 -0400 Received: from mail-lf1-x12f.google.com ([2a00:1450:4864:20::12f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qF82B-0007I7-Es for emacs-orgmode@gnu.org; Fri, 30 Jun 2023 02:55:13 -0400 Received: by mail-lf1-x12f.google.com with SMTP id 2adb3069b0e04-4fb91513b1bso410547e87.0 for ; Thu, 29 Jun 2023 23:55:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688108109; x=1690700109; h=to:subject:message-id:date:from:references:in-reply-to:mime-version :from:to:cc:subject:date:message-id:reply-to; bh=C67eLwFIlYcbMzDMOvCtj+ylUG4OhFebyPRGGtFcp1w=; b=gSV38m6f9vcpBT3ZYksPXp16qRBS1WjRhzcH+zI+akqt6r6Kc/PJXTmm44AUfUc2mG q6wJNWw+WmsNodhB7wqV2esl017VFhqvl8zlXKDN282UMmybSjSSIkfXWe8KfmVZwWzg nkl9k4mAHT6IITfZZ35wDpUMtt0C9QZXaB9if/0/nneMCHOsOrl9z2yUCyCIs1Nrax1K MrWnKUPpGEhJOVuRSSDqHXMH3ewJHIiK/f4lDq2qW2rwIyBNG5TPWRxAqys3V3ocu/lN fsfUEtSH41458rcaCFLtnesoZi42V1dwhiGMFO0MusDhIhhxbXskcnUwauzLj/U70q0G O6gA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688108109; x=1690700109; h=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=C67eLwFIlYcbMzDMOvCtj+ylUG4OhFebyPRGGtFcp1w=; b=epUF229hN1pvviNsbIOdU7CbUO2s+bytgw4nFixlADVxh18fRrR0h6bjouiezsR+QW veiY8C1aNkcpdmRmMC4yvJBApkcPGHWojHkuTwxWvB6KG9Vb4pIOTYtPzQRdXsFLE3Qv qIB+Han8+P/Nw6KwoLgMeA1DNXZNJ8VVfD2a9dTE2EaVBTSiwGSW+i/I5v6dh2LJi0I2 4W+8jeznrYOS0GOnVZBH9iRoFUnhdnqJGgaBGsmPsaYW1C9pPEEyb8zlLlLuOVMWgRL0 461uT9sTb2MsfzYj4lj8k+7EYgnuLFVrLfzwYgmb36eQE3Yo487nCcGU2OSTZKIMxStt gqyQ== X-Gm-Message-State: ABy/qLZKtg9gyGh7EgnFTLTSiu9WnoB8Px2KZbyKzwC8wN27AKTwlgXE nFilf6S2fDorlaLGwx0C1vsT4W0py20Gsk3fFjXQukPnzuWRfA== X-Google-Smtp-Source: APBJJlH0cZdwLBNpZs+5eWLhN9DIkEC4O0k+WqtKB/JfYqFqbpi5uf9BkzvA8TeMNGqO0+5WXp/qX73soU6oC6muOD8= X-Received: by 2002:a19:ee01:0:b0:4fb:9ebb:641b with SMTP id g1-20020a19ee01000000b004fb9ebb641bmr1146566lfb.0.1688108108747; Thu, 29 Jun 2023 23:55:08 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a05:6520:2de3:b0:268:94be:fdc7 with HTTP; Thu, 29 Jun 2023 23:55:07 -0700 (PDT) In-Reply-To: References: From: Samuel Wales Date: Thu, 29 Jun 2023 23:55:07 -0700 Message-ID: Subject: basic git To: emacs-orgmode@gnu.org Content-Type: text/plain; charset="UTF-8" Received-SPF: pass client-ip=2a00:1450:4864:20::12f; envelope-from=samologist@gmail.com; helo=mail-lf1-x12f.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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1688108166; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=C67eLwFIlYcbMzDMOvCtj+ylUG4OhFebyPRGGtFcp1w=; b=uLS821CgJOJniNJMHG1NdrbPXUt5n9uLwNds6dslUxxCg+fVEYNbWqp/qAlESPmxxNUcsK cpRkQhxBDWMWkq5g7A71CQchRR9Nc6zLwe1ZOQx71e1N8GSQHbBk1peiqOW/AXTliPuXpC ANNlQxA6RiLCgcM1cYdHTrNSqLEM3iR2/eXIm3JjWwen7X9IKvkoMQW0JUPgmGWzCOXd/n iFhKLtZehgNZQ1IcuTk/YjeJnsLhjzmPrszy3ITE+q0lnYUwlmq5rP9Kg9vPtxw81BR5UL 4K+EzUAmJH4RrybW7lmtu0k2k3TTWyMHfgbdcMTQfImM6W+o9Y4IOrnrEg/lqw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=gSV38m6f; 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=1688108166; a=rsa-sha256; cv=none; b=EbLtugyNKjNI2eVu8xdJ7/D7iVUgGNFKKqwa5QESjzjvhmbpFJNxuJ1AzwJDfJch0bRzYE 4GlORFurKP0049aeVCDacUIo7zio/NA8/7/QmPt5pmgXGmP0yEbRKPo0uT6J2IClBw+CS/ hhFYQEwEMIqqra7uH1diQILzceIoOyvhAMJkaTYvUPIWZpla0j46RqmrEXj1wm1WVneHhN eY05SOh31K78OHO8fJ13ZDE1HrsRKVX4ueqsCi5lfuEWxtUeYw9kdjMiHuZ5mV6++iz3Og tKUKjdQBVWyt+nRNhvX/gAbzWyRXVIJtCXIJSFWVj0XqNCBcANjXw9kIKLObDQ== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -6.42 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=gSV38m6f; 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" X-Migadu-Queue-Id: C33E32C69E X-Spam-Score: -6.42 X-TUID: +A+q7oQb9sBC i pulled vanilla bugfix and got errors. i deleted the repo, cloned org, did git checkout bugfix, pulled, and still got errors. git clone https://git.savannah.gnu.org/git/emacs/org-mode.git i am gitophobic. === On branch bugfix Your branch and 'origin/bugfix' have diverged, and have 424 and 3 different commits each, respectively. (use "git pull" to merge the remote branch into yours) You have unmerged paths. (fix conflicts and run "git commit") (use "git merge --abort" to abort the merge) Unmerged paths: (use "git add ..." to mark resolution) both modified: lisp/org.el no changes added to commit (use "git add" and/or "git commit -a") === the merge conflict is <<<<<<< HEAD ;; Version: 9.7-pre ======= ;; Version: 9.6.7 >>>>>>> 7da765e459384f68d764589c94fd26472f1c3361 thanks for anything that will get me back to my old habits of just having a repo and pulling it. p.s. i HATE git. -- The Kafka Pandemic A blog about science, health, human rights, and misopathy: https://thekafkapandemic.blogspot.com -- The Kafka Pandemic A blog about science, health, human rights, and misopathy: https://thekafkapandemic.blogspot.com