version control - git push error between two local respositories -


i have (main)folder 'prj' directories , have git init there creating repo , added , committed files git add *

i have created directory 'prj2' have git init , did git pull copied on 'prj2'

now when make changes files in prj2 repo , commit, git push prj(main) gives error:

remote: error: refusing update checked out branch: refs/heads/master[k remote: error: default, updating current branch in non-bare repository[k remote: error: denied, because make index , work tree inconsistent[k remote: error: pushed, , require 'git r.............

is correct way set main project(prj) , second(prj2) can push main?

and if pushing not possible because main project repo non bare git init..etc, how should 1 push main repo?

or different set better?

the easier way clone main project , configure remote. fact it's local not issue

in other words, instead of initing 2 repos, init --bare 1 , clone it.

or if both need have working copy (i.e. not bare) can make work if both repos not in same branch @ same time. if were, means working copy of prj1 become invalid when prj2 pushed changes (that's why error).

finally, if need in same branch, git wrong tool use since talking more of mirror. in case rsync work better


Comments

Post a Comment

Popular posts from this blog

c++ - Difference between pre and post decrement in recursive function argument -

i have following sample code used pre-decrement void function(int c) { if(c == 0) { return; } else { cout << "dp" << c << endl; function(--c); cout << c << endl; return; } } this function give output input 4 : dp3 dp2 dp1 dp0 0 1 2 3 but when use post decrement void function(int c) { if(c == 0) { return; } else { cout << "dp" << c << endl; function(c--); cout << c << endl; return; } } output goes in infinite loop dp4 can explain me in detail why happens ? this happens because function(c--) called same value of c , when finishes c decremented. recursively called, hence called same value no chance of return , hit stack overflow error. assume this, int x = 1, y = 0; y = x++ result y == 1 , x == 2. if y = ++x , bot x , y 2.
Read more

php - Nothing but 'run(); ' when browsing to my local project, how do I fix this? -

i added new project. made mistake in projectname.conf file in sites-available apache2, led me reinstalling apache2. after reinstalling , re-enabling projects on every page of every project .. <body> run(); </body> .. i've run composer update, restarted service, restarted pc, checked config files, tried disabling new project. there nothing in error log, , access.log: 127.0.0.1 - - [15/may/2015:01:40:47 +0200] "get / http/1.1" 304 181 "-" "mozilla/5.0 (x11; ubuntu; linux x86_64; rv:38.0) gecko/20100101 firefox/38.0" maybe i'm forgetting apache2 reinstall? don't think did different last time installed it. looks haven't setup php correctly. take @ this great guide , maybe you're forgetting link php config apache2.
Read more

php - How can I echo out this array? -

i don't know how go grabbing data in variable , put foreach loop. class tree{ private $info = array( array('name'=>'jim','state'=>'nu','company'=>'nu','phone'=>array('cell'=>'5615111111','office'=>'5611111111'),'email'=>array('primary'=>'exs@example.com','ex@there.com')), array('name'=>'joe smith','city'=>'phoenix','phone'=>'4805551111','email'=>'jsmith@some_email.com'), array('name'=>'john doe','city'=>'chandler','company'=>'doe co.','email'=>array('jdoe@gmail.com','personal'=>'email@email.com'),'phone'=>'6025550002') ); } if you're inside of class, can access private variable using $this->variablename . example, i
Read more