GIT workflow troubles

Question

My company has a boilerplate theme we use as a starting point for each project hosted on github. Here's what im stuck on at the moment:

git clone [github url] onto staging server
git clone [staging url] onto local machine
make changes locally
git commit/push (using smartGit on local machine)

changes to the file dont appear on staging server

if i run 'git status' on staging server, i can see the file is 'modified' but i dont want to push that to my github. i want this code to be publicly visible.

score 0 · Accepted Answer · edited May 23 '17 at 10:25

0

The issue you might see is that you're pushing to a non-bare repository. This means that the staging repository has a working copy, since you cloned it from another one, and Git disallow pushing changes to the current branch of remote repository that has a working copy.

This should have raised an error from git push operation, maybe you didn't pay attention to it?

To fix this, you'll want to change the staging repo to a bare one, and checkout the working copy to a different location on the server.

You can also look at deployment tools such as git-ftp. See also this page.

edited May 23 '17 at 10:25

Community

1
1

answered Jul 22 '13 at 12:24

CharlesB

86,532
28
194
218

Yeah, i was suppressing errors, thanks for the links. The caius theory article is very helpful. – ryaan_anthony Jul 22 '13 at 13:25
Glad to have helped, thanks for accepting the answer! you can also upvote btw – CharlesB Jul 22 '13 at 13:28
"Vote Up requires 15 reputation" i first have to earn the right to vote – ryaan_anthony Jul 22 '13 at 15:58
@ryan-inverseparadox: Oh I thought you could still upvote on answers to your own questions... – CharlesB Jul 22 '13 at 16:11

GIT workflow troubles

1 Answers1