Re: basic git

[Samuel Wales]

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