Git marks my new pushed files as deleted in the remote repository (staging server) -


whenever push local code staging server (a remote repository) don't show instead appear in 'git status' deleted. how can set properly?

i work in local repository ('development' branch). other non-git people putting files directly on server (and server period updates well). have set server 'staging' branch. when want push code server. add / commit changes made on server in 'staging' branch. pull them down local 'staging' branch. merge them 'development' branch. push 'staging' branch server. unfortunately no longer working - new files marked 'deleted' , changed files marked 'modified'. how can resolve condition? files don't appear in directory.

i suspect has change made there resolve fact live staging server , wanted able push checked-out branch.

git config receive.denycurrentbranch ignore

any help, ideas, scorn, ridicule, resolutions, appreciated.

are saying you're working developers not using source code control @ --- pushing changes directly deployment?

you can setup bare repo allow you:

  • to add , accept files working tree (not managed git)
  • to push own file (after having pulled first, in order take account files added non-git users)

the first point can done cron job would, instance every minutes, a:

cd /your/bare/repo git --work-tree /path/to/non/git/workingtree add -a git commit -m "add files non-git users"

(you might want adapt naive implementation in order commit if files added)

the second point needs completed post-receive hook on bare repo in order automatically copy files on non-git user repo.

this isn't ideal solution there possibility of race condition: needs more robust, possible chown or other right management, preventing non-git users modifications while pushing -- updating working tree.

but shows possible way make 2 world collaborate each other.


-

Comments

Post a Comment

Popular posts from this blog

html - Sizing a high-res image (~8MB) to display entirely in a small div (circular, diameter 100px) -

first of all, thank being patient know simple question more couple of weeks' experience figure out. i've seen folks persevere , helpful on here , hope you're willing me. here fiddle: http://jsfiddle.net/65uzf/ here 1 of places searched answers on here: ( vertically center image thumbnails fix-sized div ) tried solutions on there , didn't work out me. i've searched ~4 or 5 others, , been unsuccessful those, too. what want take large image (what linked background-image #ysypic , #tabpic divs) , display thumbnail version of image in confines of divs have set it. is, using background properties have laid out in css, portion of image displays inside of circular divs. without these properties, display defaults smaller section of image [presumably pi*(50^2) area in top left] terrible resolution. i not care if entire image doesn't display inside of circles (it won't, given difference in shape), , overflow not being displayed fine. want able see figu
Read more

java - IntelliJ - No such instance method -

using intellij's 12 ultimate, i'm running following code in debugger: java import play.api.libs.json.jsvalue; public class foo { ... public jsvalue tojson() { ... } public class fooexample { ... foo foo = new foo(); system.out.println("...); //<-- breakpoint at breakpoint, right-clicked source code , picked "evaluate expression," typing in: foo.tojson() . but following error showed up: no such instance method: play.api.libs.json.jsvalue$class.com.foo.foo.tojson () am doing wrong? foo#tojson calls scala code, if matters. edit had breakpoint after instantiation of foo. downvoted it, deserved it. edit my answer no longer valid after op modified question (i.e. moved breakpoint actual is).. a breakpoint hit before line executed. in case foo has not yet been declared or instantiated (i.e. foo constructor has not yet been called). you'll need put breakpoint @ next line (or step on current line) if want evaluate foo .
Read more

identifier - Is it possible for an html5 document to have two ids? -

i wondering if html5 element can have 2 ids, this: <button id="thing1" id="thing2" name="button1" onclick="change()">click here</button> or this: <button id="thing1, thing2" name="button1" onclick="change()">click here</button> also, if 1 of ids said 1 thing, , other id said thing, 1 used? tl;dr : no. in versions of html, each element can have 1 id. see the spec : the id attribute specifies element's unique identifier (id). [dom] the value must unique amongst ids in element's home subtree , must contain @ least 1 character. the value must not contain space characters. note: there no other restrictions on form id can take; in particular, ids can consist of digits, start digit, start underscore, consist of punctuation , etc. note: element's unique identifier can used variety of purposes, notably way link specific parts of document usin
Read more