Re: basic git

[Max Nikulin]

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.