From: Samuel Wales <samologist@gmail.com>
To: Dumitru Sipos <dumitru.sipos@gmail.com>
Cc: emacs-orgmode@gnu.org
Subject: Re: basic git
Date: Fri, 30 Jun 2023 00:20:40 -0700 [thread overview]
Message-ID: <CAJcAo8v=hyi9cVMJyGv-wEQoGAzx67QhMvkxEVRnSvkcnneEWw@mail.gmail.com> (raw)
In-Reply-To: <2bc86b92-5e25-b509-bcda-b8f6c12323d1@gmail.com>
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 keep multiple copies for speed in switching for
testing] to clean up an old org with a local.mk do i just delete that
file? can i keep doing make oldorg?
On 6/30/23, Dumitru Sipos <dumitru.sipos@gmail.com> wrote:
> 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 <samologist@gmail.com> 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 <file>..." 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
>>>
>>
>
>
--
The Kafka Pandemic
A blog about science, health, human rights, and misopathy:
https://thekafkapandemic.blogspot.com
next prev parent reply other threads:[~2023-06-30 7:21 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 [this message]
2023-06-30 11:58 ` Ihor Radchenko
2023-06-30 10:14 ` Max Nikulin
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='CAJcAo8v=hyi9cVMJyGv-wEQoGAzx67QhMvkxEVRnSvkcnneEWw@mail.gmail.com' \
--to=samologist@gmail.com \
--cc=dumitru.sipos@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).