DocBook v2

[Thibaut Cuvelier]

On Mon, 31 Aug 2020 at 18:41, Kornel Benko <kornel at lyx.org> wrote:

> Am Mon, 31 Aug 2020 18:23:07 +0200
> schrieb Thibaut Cuvelier <tcuvelier at lyx.org>:
>
> > I finally got it to display Riki's last commit from today in features:
> > https://www.lyx.org/trac/log/features. It looks like I had leftovers of
> previous
> > remotes somewhere… Is this good for you?
>
> It is different now, but
>
>  $ git pull
> remote: Counting objects: 2173, done.
> remote: Compressing objects: 100% (411/411), done.
> remote: Total 1869 (delta 1553), reused 1774 (delta 1458)
> Empfange Objekte: 100% (1869/1869), 1.44 MiB | 1.02 MiB/s, Fertig.
> Löse Unterschiede auf: 100% (1553/1553), abgeschlossen mit 287 lokalen
> Objekten.
> Von git.lyx.org:features
>  + d268809f2e...1df6c7c69d feature/docbook -> origin/feature/docbook
> (Aktualisierung
> erzwungen)
> Your configuration specifies to merge with the ref
> 'refs/heads/features/docbook'
> from the remote, but no such ref was fetched.
> Exit 1
>
> So, there is something fishy ...  and 'git log' did not change.
> Unfortunately I am no a git-expert, so no idea how to cure this stage.
>

What about deleting your local branch (git branch -d feature/docbook) and
trying again? Probably not the nicest way to solve it, but I can't say my
Git skills are excellent either…
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.lyx.org/pipermail/lyx-devel/attachments/20200831/9d7d238b/attachment.html>