Steve, Thanks for the response, but believe me, I've read your post and several others. I get how to push from the client. I'm asking how to integrate the client's changes on the server.
I did all of the lines you wrote in your example... on my client. Then I ssh into the server. And I see that some changes have been made by a client. But I have no idea how to put those into my server's code. In one of your articles there is this line: /luvd(master) $ git remote add drnic git://github.com/drnic/lovd-by-less.git And you use that to pull changes from drnic. But that assumes the drnic client has a github account. What about my local machine which I can ssh out from but not ssh into (b/c it has no specific ip/ hostname)? How can I integrate changes from this local machine when I'm ssh'ed into my server? Thanks again, Drew On Sep 21, 10:51 pm, "Steven A Bristol" <[EMAIL PROTECTED]> wrote: > On Sun, Sep 21, 2008 at 10:02 PM, drew <[EMAIL PROTECTED]> wrote: > > > I have my main git server at asdf.com. I have a client that made a > > change, committed it, and pushed it. Now the server (with my "main" > > repo) shows this: > > >> git status > > # Updated but not checked in: > > # (will commit) > > # > > # modified: test/test_helper.rb > > # > > > OK, cool. So my server knows I made that change on a client. The > > code on my server is still the same so far (that's as expected). But > > I can't get the damn change into my server's codebase. What are the > > commands? Also, please note, I don't have a specific hostname for the > > client that submitted the change (client is not on a static ip). So I > > can't just tell the server to update from the client's remote repo. > > But I shouldn't have to know where the client machine is, since the > > client already submitted the change to my server and my server is > > aware of the change. Right? So how do I merge that client's change > > into the code on my server? Shouldn't this be simple? > > I've found the best place to ask git question is in #github on freenode. > > But here is the basic run down (you can find a few articles I wrote > about git on my bloghttp://b.lesseverything.com/search?q=git): > > git clone url > <change files> > git status > git commit -a -m "message" > git push (This is the command to _push_ your changes back to the server) > git pull (to get other's changes from the server) > > cheers, > > steven bristol --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Lovd by Less" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/lovdbyless?hl=en Who loves ya baby? -~----------~----~----~----~------~----~------~--~---
