From: Max Nikulin <manikulin@gmail.com>
To: emacs-orgmode@gnu.org
Subject: Re: basic git
Date: Fri, 30 Jun 2023 17:14:42 +0700 [thread overview]
Message-ID: <u7m9uk$hmm$1@ciao.gmane.io> (raw)
In-Reply-To: <CAJcAo8uJGEo3OHe2pgoTMtfmwd0NR7PHZTtfZ0AJD+WJudMFFQ@mail.gmail.com>
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.
next prev parent reply other threads:[~2023-06-30 10:15 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CAJcAo8tvmam1dErGcM+Dv=+9=YD69XT64epb+NmYuQWFd7ZFRw@mail.gmail.com>
2023-06-30 6:55 ` basic git Samuel Wales
2023-06-30 6:56 ` Samuel Wales
2023-06-30 7:07 ` Dumitru Sipos
2023-06-30 7:20 ` Samuel Wales
2023-06-30 11:58 ` Ihor Radchenko
2023-06-30 10:14 ` Max Nikulin [this message]
2023-06-30 22:15 ` Samuel Wales
2023-07-02 3:25 ` Max Nikulin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='u7m9uk$hmm$1@ciao.gmane.io' \
--to=manikulin@gmail.com \
--cc=emacs-orgmode@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).