Problem with git: remote 'refs/heads/master' is not an ancestor of local 'refs/heads/master' -

-

i faced situation don't understand. have remote git repo running on webdav / apache. sure, logged on server , run "chown -r wwwrun:www *" , "git update-server-info" on relevant directory (as root, obviously).

now, do:

git clone http://myserver/myrepo

then:

$git remote show origin * remote origin   fetch url: http://myserver/myrepo   push  url: http://myserver/myrepo   head branch: master   remote branches:     master   tracked     trunk    tracked     trunk2.0 tracked   local branch configured 'git pull':     master merges remote master   local ref configured 'git push':     master pushes master (fast-forwardable)

and change file, stage, commit , try push, results in:

error: remote 'refs/heads/master' not ancestor of local 'refs/heads/master'.

obviously, attempt pull pointless:

$git pull up-to-date.

the repository fine few days ago. how can work again?

ok, resolved problem wrote in comment. used 1 of local repositories make bare remote repo , else got synchronized it.


Comments

Post a Comment

Popular posts from this blog

Javascript line number mapping -

-
magically formatted comments change reported line number of javascript errors in browsers; this: //@line n "f" n line number , f file name. unfortunately, //@line appears ungoogleable. know there documentation on feature, , browsers support it? (i found references here , here .) from can find available in mozilla based browsers. it using js_setoptions command can turn these options on or off depending on values passed. https://developer.mozilla.org/en/js_setoptions
Read more

c# - Is it possible to remove an existing registration from Autofac container builder? -

-
something along lines: builder.registertype<mytype>().as<itype>(); builder.registertype<mytype2>().as<itype>(); builder.deregistertype<mytype>().as<itype>() var container = builder.build(); var types = container.resolve<ienumerable<itype>>(); assert.istrue(types.count == 1); assert.istrue(types[0].gettype == typeof(mytype2)); scenario: go through bunch of assemblies , go register types want make sure have 1 implementation of given type. need before create container. track on own nice if autofac me bit. this cannot done directly using containerbuilder , unless start on new one. mind you, having first built container should able construct new container filtering away unwanted types , reusing registrations first container. this: ... var container = builder.build(); builder = new containerbuilder(); var components = container.componentregistry.registrations .where(cr => cr.activator.limittype != typ...
Read more

php - Mysql PK and FK char(36) vs int(10) -

-
i have read mysql can handle indexes , searches better if tables keys integers rather char(36) uuid's. is worth converting int(10)? note: use 1 server , have have plans use multiple databases concurrently therefore removing 1 of big reasons using uuid. our tables innodb if makes difference. thanks in advance. usually rdbms can handle integer keys pk more efficient, other datatypes. reason how build index column, yes: long dont require string (or other typed) keys, should use integers. however: char(36) , int(10) far away being equal, because int(10) much smaller, char(36). dont know, if require many different keys, should keep in mind. update, complete last paragraph: int(10) 32-bit, char(36) 36 - ^byte^ (= 288-bit). not mean, int consumes less space, means, char(36) has 4 times more different keys.
Read more