On 01/07/2023 05:15, Samuel Wales wrote:
On 6/30/23, Max Nikulin wrote:
Do you have history of last git commands, e.g. in an emacs eshell
buffer? Please, post them.
It is unclear what was the current branch before (a custom local one,
"bugfix" or "main" tracking the upstream) and whether all
On 6/30/23, Max Nikulin wrote:
> 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"
Samuel Wales writes:
> apropos of nothing, btw what does one do to make org these days?
>
> make cleanall;make? make oldorg?
Just make will trigger compilation.
make oldorg will also trigger building Info manual (in addition to compilation).
make cleanall is good to do to avoid Emacs re-using
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
i did it a few times, it broke, i did what you did, which is really
the same except like -a, it works, i moved that to my dir, it works
for now. thanks. older git.
===
apropos of nothing, btw what does one do to make org these days?
make cleanall;make? make oldorg?
as for other repos [i
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)
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 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
