From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.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 iHbBJt58nmQaAAAASxT56A (envelope-from ) for ; Fri, 30 Jun 2023 08:57:34 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id 0F+0Jd58nmSURgEAG6o9tA (envelope-from ) for ; Fri, 30 Jun 2023 08:57:34 +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 288603C024 for ; Fri, 30 Jun 2023 08:57:34 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=Ha7nKMZs; 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=1688108254; 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=6aZcAi3Lhp0y//zN5Tf7LruORQkRL9lz6qvQi71RPOM=; b=Tco6c+poMoBVl+gjyXnKE1F5m3Kcmnq4wfSiRpc1Jm3Rr8LusnQcCwqYE2a1maaLC1osiW tQTO2lEDnDkRZrRJVFJwFk1iTR8jz1pPVUwksrP8YKFaiRRNfOWPvvc/OHQLYwjRQTc1Sz KPOzvQd5mjQCCzmloVFXvoESEehMcBwu57lEeFC/wbBMYqlaOLaBsjHOEWGhEVMujYiFrO aipv8uZYk6Es5UG010oiheeF0f/IzBB3YZ+r4EA/bWxTnD0/p9++HCageAwF/v9Nhf1fPp OQzpWtd82dlnU8c9+jY3Cwb5gC1DgdjNADSqU3ccM7ax8dKmC5V1ptgeScurgw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=Ha7nKMZs; 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=1688108254; a=rsa-sha256; cv=none; b=atNOddy8PitXBnNGQQcxE0+5ibq7/v5cjbcNRxtEpu0kbvs+YTQrcZde8kndLuMamJaTp0 rAb4Q3itMMxvorinbEGmQ/vjxhbaFhfEusAlbItzqLYtKTWQu1Rr3hleqA3/5GZl+gTGnd GqY57Vgg0f2B8y7nRH4KmWkCl2EAJyM1Q26MsnE+ZfPLzKQI1OuudIcliWC1ctYxDbWw15 OaX+raVpHisR14fb0DYmMq+tvdn9vgdOWyrwKvEa+or0fttiikGt+nuhuRzmiMp/6RaHn5 m4O6JgDfVVwQ84QOKcS/3k3uqutxDcNqNOY4a8bh0GUAtoucF1KH2i+8S1GVrQ== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qF83q-0003o4-27; Fri, 30 Jun 2023 02:56:54 -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 1qF83p-0003nu-66 for emacs-orgmode@gnu.org; Fri, 30 Jun 2023 02:56:53 -0400 Received: from mail-lf1-x12e.google.com ([2a00:1450:4864:20::12e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qF83n-00007a-Gs for emacs-orgmode@gnu.org; Fri, 30 Jun 2023 02:56:52 -0400 Received: by mail-lf1-x12e.google.com with SMTP id 2adb3069b0e04-4fb90f72062so436275e87.0 for ; Thu, 29 Jun 2023 23:56:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688108209; x=1690700209; h=to:subject:message-id:date:from:references:in-reply-to:mime-version :from:to:cc:subject:date:message-id:reply-to; bh=6aZcAi3Lhp0y//zN5Tf7LruORQkRL9lz6qvQi71RPOM=; b=Ha7nKMZsnGTM+uILfWFsNW6bWWcq3OdTrB6Di+6RcbvgZVIfB9F02zJHN+njgxTLuW B6f1R/d/PVyF/v9ZyQYkOIiJfTtBeJX1fxpq5oMBGRH4xv8FZg6HtzLdKAm6+V+rlz1D tyOImR2Mi6Rtxz9wXhZDwenzaUQNdUZtf5hkOteNTsWf5KdrbXdsqL4KLelVhLNkHNYk dMQvHVfCzKLPtbQCIqdUXH6xdkDsJa9oNzSocdm4UDthj7Eebo63kb/J+d3XZH1/ibSC Apthn1OS4Xt1dETHeggFDV7YtWHhcV23jmPOBPFJFywHpaMJBp6jyAnPgJFnKecmrY2q HsOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688108209; x=1690700209; 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=6aZcAi3Lhp0y//zN5Tf7LruORQkRL9lz6qvQi71RPOM=; b=Dd7XCIQSWsNA4T6Anro/1U4Hia/YX1LWJw6+eMIUFde3ADz5xa347ViA0tA+VihcBV OpsfGXt2SMQPSioo5Pzo1XP9oE5VdNiaKmkci+q4TpsX92hXjDaMiKVx+St2Ev0iizk9 uUKcp9ZCKWODsQq9fhnqG9e0WqGbScv1B6FR7nJdFJ/L2VW6pd8mg/J5aUJTcK1JzFYn rOowUBsaNpERTbKT1Yls29G/2r/MByhKn7soGKiu53U+dJP7VSo7Xc1Eif4z+jA10L3T TkTEvyzgOt4FXHAcBD0s1y8C1A4PBXmOYtXAh7fFgzdbEy7CwP3IR101ndz68opCXMOY /QtA== X-Gm-Message-State: ABy/qLYUiw0vU+tqfUFYS6hWtfFeYaKMpv5Scpd66FdBM5uq9lmb6c1y mzJ/VZ9IDaoN3Wmt8iE/U63EbQ/aG2Z9BiKdlP0wD3H2cCOoLg== X-Google-Smtp-Source: APBJJlH3RkZP+5+5ArZc70HZwteJrlo6SVk8cd9jQbLL+3YrO4jn/Q98BC/uS8S4ujxB5EOs2xW6llycYLJFQ/iVtj8= X-Received: by 2002:ac2:5198:0:b0:4fa:fe2b:dfd3 with SMTP id u24-20020ac25198000000b004fafe2bdfd3mr1195167lfi.5.1688108208854; Thu, 29 Jun 2023 23:56:48 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a05:6520:2de3:b0:268:94be:fdc7 with HTTP; Thu, 29 Jun 2023 23:56:48 -0700 (PDT) In-Reply-To: References: From: Samuel Wales Date: Thu, 29 Jun 2023 23:56:48 -0700 Message-ID: Subject: Re: basic git To: emacs-orgmode@gnu.org Content-Type: text/plain; charset="UTF-8" Received-SPF: pass client-ip=2a00:1450:4864:20::12e; envelope-from=samologist@gmail.com; helo=mail-lf1-x12e.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: scn0.migadu.com X-Migadu-Spam-Score: -8.22 X-Spam-Score: -8.22 X-Migadu-Queue-Id: 288603C024 X-TUID: /ZjXU1RSY62w how can a freshly cloned bugfix be any different from upstream? On 6/29/23, Samuel Wales wrote: > 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 > -- The Kafka Pandemic A blog about science, health, human rights, and misopathy: https://thekafkapandemic.blogspot.com