On 9/3/20 1:12 PM, Kornel Benko wrote: > Am Thu, 3 Sep 2020 12:47:16 -0400 > schrieb Richard Kimberly Heck <rikih...@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 <rikih...@lyx.org>: >>> >>>> On 9/2/20 10:35 AM, Kornel Benko wrote: >>>>> Am Wed, 2 Sep 2020 16:15:24 +0200 >>>>> schrieb Thibaut Cuvelier <tcuvel...@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.
Not necessarily. It depends how certain other things are set up on your machine. I think the confusion must trace to the fact that in the 'features' repo there is a branch called 'feature/docbook'. So I see, e.g.: > git branch -a | grep docbook remotes/features/feature/docbook It's possible that one of these is an old an inactive branch that got renamed or something. > 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') It's fine to do that. It will only remove the branch on your machine. Whatever head it points at will still be there. I'd be inclined to start over, in fact: remove both branches and then check out features/feature/docbook again (with the -t switch). You might also try: git fetch --prune features (assuming that 'features' is what that remote is named on your machine---you can give it a different name if you wish just for local use). Riki -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
