From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id mF2nOoZ/nmT5YwEASxT56A (envelope-from ) for ; Fri, 30 Jun 2023 09:08:55 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id cB2dOYZ/nmQ1uwAAG6o9tA (envelope-from ) for ; Fri, 30 Jun 2023 09:08:54 +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 929F331A2E for ; Fri, 30 Jun 2023 09:08:54 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qF8EA-00070y-ML; Fri, 30 Jun 2023 03:07:34 -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 1qF8E9-00070n-0k for emacs-orgmode@gnu.org; Fri, 30 Jun 2023 03:07:33 -0400 Received: from mail-ej1-x634.google.com ([2a00:1450:4864:20::634]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qF8E7-0000BQ-4E for emacs-orgmode@gnu.org; Fri, 30 Jun 2023 03:07:32 -0400 Received: by mail-ej1-x634.google.com with SMTP id a640c23a62f3a-992e22c09edso36312666b.2 for ; Fri, 30 Jun 2023 00:07:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688108849; x=1690700849; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=fM0dMdhpAXrCp/y/Jsrl8MLDAv9nkTzXxZyqvUkGnrc=; b=e7QntmA6G77uEQ2OuK5PmLJK4+gHG1kGe/tA8Zct6lJduxaKPgZdo2v7GyLSDZhCxA MMskPjq3Cr0hZjm6URIKNkq7D2Gsr+apQZtSBfdpsMa6A/ewpaMXVkrB5VXCVjeYnx1O /QQZvICUqifEnhRe8ClEOs/XqKGCsqB3F+l+pb0zjOMR9+Syt6trTyDov0Ed2O9eBhQ0 VXIY3KjXAffTjc94NOt9q+iaYaLv7wD9TzUO1sIrM0FOF+5CfoQ0rrWQG8yREiarMTul Yby0SwivMdAyaLrU9sndPaHuPNvl4HRg3LsGEO8QNcI78tvPU4MjRz8ju4V+8phhxkBr D++A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688108849; x=1690700849; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=fM0dMdhpAXrCp/y/Jsrl8MLDAv9nkTzXxZyqvUkGnrc=; b=YV47Wj0EAMW33WpFZcAv6F3FP7UGefMfFJdRLucOuDPG5DwlTbzUIwEdZn4lUUOAaD U3ajCflGHCG6Zo6Y9NxUP802mtclK+neTcFC+pvkP/ZNA2q5L5MGQHqzVcHI5egDH1Gh cAKsQUDqGiCxMpINRuYLwSwDAVjCv/PhusI9G1lVYBy09JjLz2MQYLs2toikxFIpk+bd chyXDP3a0kWP2OBNrUqiCkXAkVb2jeYwUDDUv7IHc0pWbV3euhRVzWt8ZN4BylVugBrR TU94B6YbA6xg/LlA6bPDWSZn6CaTdcSaneo7owjnD7IF/VbGBV3kvs7Ze+2uKl1TFvrH Vuiw== X-Gm-Message-State: ABy/qLbVQRM4qBEMp1m5mlunxNnxCwxYxm+TwdKOUfGUzLWatVqUrVFx /otRAtMJxc9cME9EImvR4GhEEC8WiHU= X-Google-Smtp-Source: APBJJlF/jSRyHAwxVePfE/IZwa+kmRoSu5r5YNFvGUNXG8sIrm+4bQcigM5mZ/G/2slAdTOen1fmqA== X-Received: by 2002:a17:906:4dd5:b0:961:be96:b0e7 with SMTP id f21-20020a1709064dd500b00961be96b0e7mr1261724ejw.48.1688108848734; Fri, 30 Jun 2023 00:07:28 -0700 (PDT) Received: from [172.30.9.6] ([131.228.32.166]) by smtp.gmail.com with ESMTPSA id ec10-20020a170906b6ca00b009893650453fsm7825311ejb.173.2023.06.30.00.07.27 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 30 Jun 2023 00:07:28 -0700 (PDT) Message-ID: <2bc86b92-5e25-b509-bcda-b8f6c12323d1@gmail.com> Date: Fri, 30 Jun 2023 09:07:26 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Subject: Re: basic git Content-Language: en-US To: emacs-orgmode@gnu.org References: From: Dumitru Sipos In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::634; envelope-from=dumitru.sipos@gmail.com; helo=mail-ej1-x634.google.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 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, NICE_REPLY_A=-0.093, 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-Seal: i=1; s=key1; d=yhetil.org; t=1688108934; a=rsa-sha256; cv=none; b=TCJIIjzYNtvZ4RATqyHi9sA1Nr5f8RLGoWexYzABQDsPNCdsKPaCqexf3hSexVK8p7cPBY yeT1+0EGmQ23h9uB3p4Lf4i2PhrdZLZL1R03B9yvReOZNqXGAQQyGZQJ7bjVdkoYnTMYAP sCThqNVD4Q/UkfGC3uVuqgk2Cv6PF+s93v913qj0exi2nogbV/hyc5AALby74lNmjEIWXN X9jnLETUhYMZfwszCkfdGbPfW8yDO8M1TgjelpsZy1+dOi46aXZY4YC/JUrvcdQjpPGDuG I0IHxVpTns54O7QMViyTSyNxSvTaIS5RJiMRYCBxTSnTfFMlrosDaZigFROZyg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=e7QntmA6; 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=1688108934; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=fM0dMdhpAXrCp/y/Jsrl8MLDAv9nkTzXxZyqvUkGnrc=; b=JhlqAdsOmYB/HdXoOJ3FjH3BEgY1sEZhm8bqLM6YVKn/RaxazTASm6rhAmCSAzIdPYts/w 6RKscTIIVfYfwpd9arhP3x7gGLVjwvU9teE0rGMRRdI3GNBlfSY2+jQInGEJ3P0E6a3Xj8 LCk9vFv2aLpm+BKz6lvCQ2JfHDpRhPJTZ88Oa2kHHWV/lTGG91KBpZrazSEb4NQ+0samWV SY1cV9hetTHNSmis5rSu5wKkV+2HHxgPkOHsoIS0BVv0Q0s3WpS5jm8sq3vtnbDMASe98D l0dIRo2/ix91V2bbd5Kkl/xQBOZVEYxEFO7MPHQ7UU4YqbNe6E2sz4n0eSTSrA== Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=e7QntmA6; 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-Scanner: scn0.migadu.com X-Migadu-Spam-Score: -7.72 X-Spam-Score: -7.72 X-Migadu-Queue-Id: 929F331A2E X-TUID: aO5zU8smX2Cd It behaves quite normally on my side: $ git clone https://git.savannah.gnu.org/git/emacs/org-mode.git Cloning into 'org-mode'... remote: Counting objects: 141138, done. remote: Compressing objects: 100% (30420/30420), done. remote: Total 141138 (delta 110608), reused 141085 (delta 110576) Receiving objects: 100% (141138/141138), 96.60 MiB | 21.35 MiB/s, done. Resolving deltas: 100% (110608/110608), done. $ cd org-mode/ $ git branch -a * main   remotes/origin/HEAD -> origin/main   remotes/origin/bugfix   remotes/origin/emacs-sync   remotes/origin/main $ git checkout bugfix branch 'bugfix' set up to track 'origin/bugfix'. Switched to a new branch 'bugfix' $ git branch -a * bugfix   main   remotes/origin/HEAD -> origin/main   remotes/origin/bugfix   remotes/origin/emacs-sync   remotes/origin/main $ git pull Already up to date. $ git pull origin bugfix From https://git.savannah.gnu.org/git/emacs/org-mode  * branch                bugfix     -> FETCH_HEAD Already up to date. $ git --version git version 2.39.0 On 30-Jun-23 08:56, Samuel Wales wrote: > 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 >> >