On 05/17/2014 04:27 PM, Enrico Forestieri wrote:
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.
I think somehow the origin/2.0.x branch got deleted locally, and you will see it now if you look at the output of "git br -a". I sometimes run into these naming conflicts, where I've got a local branch bugs/whatever and I've pushed it (for backup, basically) to my developers repo, which would be at rgheck/bugs/whatever, locally. I haven't figured out why this
happens. Richard
