DocBook v2

[Kornel Benko]

Am Thu, 3 Sep 2020 12:47:16 -0400
schrieb Richard Kimberly Heck <rikiheck at lyx.org>:

> On 9/3/20 3:36 AM, Kornel Benko wrote:
> > Am Thu, 3 Sep 2020 02:48:03 -0400
> > schrieb Richard Kimberly Heck <rikiheck at lyx.org>:
> >  
> >> On 9/2/20 10:35 AM, Kornel Benko wrote:  
> >>> Am Wed, 2 Sep 2020 16:15:24 +0200
> >>> schrieb Thibaut Cuvelier <tcuvelier at lyx.org>:
> >>>    
> >>>>> Exit 1
> >>>>>    
> >>>> That's quite an improvement, I did not expect that! Thanks for running the
> >>>> tests :).     
> >>> No problem.
> >>>
> >>> BTW, why do we have these two branches
> >>> 	feature/docbook
> >>> 	features/docbook
> >>> ?
> >>> Isn't it easier to work on one branch only? (E.g. feature/docbook)    
> >> The repo names here are local to you. You should check your
> >> $LYXDIR/.git/config file and see if you have two aliases to the features
> >> repo.
> >>
> >> You may need to do something like:
> >>
> >> git fetch feature[?s]
> >>
> >> depending upon how you set things up.
> >>
> >> Riki
> >>
> >> PS I know git can be frustrating. But I am pretty sure that is because
> >> it is so powerful.
> >>
> >>
> >>  
> > Riki, I cannot see anything in this file which could signal 'local' ...  
> 
> What I mean is: These branch names are determined by what is in your
> .git/config file and don't necessarily correspond to anything on the LyX
> server. You probably have two branches both attached to the same branch
> on the features repo.
> 
> Riki
> 
> 
> >
> > 	Kornel  
> 
> 

Hm, but the refs
	merge = refs/heads/features/docbook
and
	merge = refs/heads/feature/docbook
indicate (to me) different remote branches.

Apparently I don't understand what's going on.
I tried to remove the entry, still 'git branch -r' is showing me the same as before.
(Didn't dare to use 'git branch -d features/docbook')

	Kornel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: Digitale Signatur von OpenPGP
URL: <http://lists.lyx.org/pipermail/lyx-devel/attachments/20200903/16601a83/attachment-0001.asc>