Try to say the branch you want to pull and push: git pull origin nov2012 --rebase git push origin nov2012
William Seiti Mizuta @williammizuta Desenvolvedor da Caelum On Tue, Nov 6, 2012 at 3:43 AM, kramer.newsreader < [email protected]> wrote: > > > Is your remote a 'bare' repository, or does it have a working directory? >> -- I ask because you say you are working on the branch on both sides. >> > > >> It is normal to have your remote as a 'bare' repo, though you can manage >> if both are 'working' but in such cases you would use different branches on >> the repos so that you won't loose data. >> > > I am not really sure I understand your question. I didn't set up this > repository. I have to work on it. > > The person who did is mostly unavailable. > > Having said that I *think* it is bare but I'm not sure. > > Does the output that I pasted above bear on that fact? If not, is there > more information I can give? > > Sorry, but git is very confusing to me. > > -- > > > --
