Sorry, should have been clearer /public_html/me /public_html/her then commit to /public_html.
It sounds like what you're saying is for me to set it up in public_html, have her clone it, and the push and pull as we need to with no separate directories. I was looking at some how_to's and they were talking about merging and all that stuff. Thanks! M@ On Sep 12, 11:01 am, Petr Baudis <[EMAIL PROTECTED]> wrote: > Hi, > > > > On Fri, Sep 12, 2008 at 07:53:14AM -0700, M@ wrote: > > I have a small project that I am going to be working on using PHP/ > > mySQL. I have a friend who would like to help me work on it. > > > We're both on windows machine and she is really unfamiliar with > > command line stuff, but picks things up pretty quickly. I'm also > > getting into some ruby development and saw Git mentioned everywhere. > > I thought this might be a good opportunity to start getting my feet > > wet with Git. > > > I have git installed on my webhost (bluehost.com), and I'd like to > > start utilizing it. Is there a way for me to develop in tandem with > > my friend? We're going to be developing different parts of the > > project so there shouldn't be any overlap, but I was hoping on some > > advice for getting started. > > > I had thought I might create two directories inside the site, one for > > her, and one for me, and merge our code when it was ready into the > > main site directory. > > > Am I going about this all wrong? > > I'm not sure what "two directories inside the site" means, but be sure > to both work within the same directory hierarchy within the repository > itself. > > Simplest setup: First, import your project to Git and upload that to > the site, then let her clone it. Then, you can both start hacking away > and committing stuff, pulling from the site pushing back once in a while. > Sometimes, you will get an error that newer changes are at the site than > in your local repository - in that case, git pull first - that will > merge the changes of the other person - and then try git push again. > > I recommend you to follow one of the many Git tutorials lying around > all over the net. > > -- > Petr "Pasky" Baudis > The next generation of interesting software will be done > on the Macintosh, not the IBM PC. -- Bill Gates --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-users@googlegroups.com To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/git-users?hl=en -~----------~----~----~----~------~----~------~--~---
