On Sat, May 17, 2014 at 03:06:25PM -0400, Richard Heck wrote: > On 05/17/2014 11:38 AM, Enrico Forestieri wrote: > >On Sat, May 17, 2014 at 05:09:54PM +0200, Enrico Forestieri wrote: > >>Most probably, I have also to issue a "git -d 2.0.x" to completely > >>get rid of the thing. For good measure, I will also perform some > >>propitiatory rite... > >Argh! Wrong rite, apparently: > > > >$ git br -d 2.0.x > >error: The branch '2.0.x' is not fully merged. > >If you are sure you want to delete it, run 'git branch -D 2.0.x'. > > > >May I really issue "git br -D 2.0.x" and not be involved in solving > >a next problem? > > It's safe to do that, if there's nothing in 2.0.x that you want. > Which, I take it, there is not.
I don't understand why it was claiming that the branch was not fully merged, because I am sure I didn't touch it after the last pull. That command worked. I only had a hiccup after pulling again, because of: >From git.lyx.org:lyx * [new branch] 2.0.x -> origin/2.0.x 936773c..4bd0941 master -> origin/master Current branch 2.1.x is up to date. but "git br" showed no trace of 2.0.x, and the following push worked as I was expecting. Thanks for the assistance to everyone. -- Enrico
