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 qLGkGlarnmRD2QAASxT56A (envelope-from ) for ; Fri, 30 Jun 2023 12:15:50 +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 OKCjGlarnmR4SgAA9RJhRA (envelope-from ) for ; Fri, 30 Jun 2023 12:15:50 +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 3009C3AC07 for ; Fri, 30 Jun 2023 12:15:50 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qFB9U-0004Ik-9i; Fri, 30 Jun 2023 06:14:56 -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 1qFB9S-0004Ib-Pf for emacs-orgmode@gnu.org; Fri, 30 Jun 2023 06:14:54 -0400 Received: from ciao.gmane.io ([116.202.254.214]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qFB9R-00021x-Cl for emacs-orgmode@gnu.org; Fri, 30 Jun 2023 06:14:54 -0400 Received: from list by ciao.gmane.io with local (Exim 4.92) (envelope-from ) id 1qFB9N-0004pG-GD for emacs-orgmode@gnu.org; Fri, 30 Jun 2023 12:14:49 +0200 X-Injected-Via-Gmane: http://gmane.org/ To: emacs-orgmode@gnu.org From: Max Nikulin Subject: Re: basic git Date: Fri, 30 Jun 2023 17:14:42 +0700 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Content-Language: en-US In-Reply-To: Received-SPF: pass client-ip=116.202.254.214; envelope-from=geo-emacs-orgmode@m.gmane-mx.org; helo=ciao.gmane.io X-Spam_score_int: 27 X-Spam_score: 2.7 X-Spam_bar: ++ X-Spam_report: (2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_ADSP_CUSTOM_MED=0.001, FORGED_GMAIL_RCVD=1, FORGED_MUA_MOZILLA=2.309, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, NICE_REPLY_A=-0.093, NML_ADSP_CUSTOM_MED=0.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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=1688120150; a=rsa-sha256; cv=none; b=tsup9hURsU2Y+YHoVNMgWeKY/V54NuvjBVogIxSNbgYAlFB6RXLQSewQ7GZvQvGMWbTD5Y wbJMjZp597jPDHterXhfFgVYSj71dcSPOedLML4ztStsLfb8d90yoEgBS3I4nAZHGnBIb7 94gc7DiWh0Rxk7BIFgM12apcWCArmRuiaw9py6mhEMj2J1G7uHefGxODsOdcA0KyphUkaW cHbfxWSVeIrcrW/uDzZR+4GusmMPdgzM4CUK1XuuhSWa+IBPFmVP9vTekhCDfY6hmtPUwv /x7fBUgDH9Q+r+EkhWJc9x8U5Fikc8ocsvdl19cYjNLSSOWEC5/DIG5rhYH++w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=gmail.com (policy=none); 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=1688120150; 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; bh=cTVCoZEtsYpSg+cFZKYjkr4SlCLYau5eVS0IG5sl0CE=; b=TsMXnbXg+r9FY2LZP/vwLTXNhgoFrnrhajIajIaJjwEwRhs21Lm46iARWjRaGHDlM9/UD2 zI3YS4Q6+s+0+yRI/NGE7Bktp3MD/cGl2uloJllcza7Akjtco4xhXah6ZBvhaHE85HnKdZ AKnlKz+/RmN+ADwNhRfWcDjTCtd1bzAIxMLxLE0yoy8G9CDkn+/CqpDhFGXrRMh3WrbJZ6 h84x+/Ult/bOtEVbxzBza8j3oUBOYx1GWs/cUNWpbbXGDtNP38XDjpnVYJcm6D1G4f/ABq HiYqgrWhM2pT2J9batb/Yh6mOD0zQHctQjBGVR2jHt/TuiA1orU4ADl+ejfW+g== Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=gmail.com (policy=none); 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: -2.46 X-Spam-Score: -2.46 X-Migadu-Queue-Id: 3009C3AC07 X-TUID: siv4Pg369Ydi 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. Do you have history of last git commands, e.g. in an emacs eshell buffer? Please, post them. Likely the safe path is to keep ";; Version: 9.6.7" from the cited fragment, git add lisp/org.el git merge --continue now create a temporary branch to not loose changes you may commit to local "bugfix" by mistake git branch tmp-bugfix-dirty You will remove it as soon as you figure out that you changes are not lost. I suggest to store reflog to a temporary file git reflog | tee 2023-06-30_git-reflog.txt it may help to restore how you came to this state. I expect that git branch --show-current reports "bugfix". To ensure it git checkout bugfix to make your local "bugfix" branch matching the upstream one git reset --hard bugfix Now you can inspect diff with tmp-bugfix-dirty and cherry-pick commits to the branch containing your changes on the top of "bugfix". Git is a flexible and powerful tool.