{"thread":{"id":"15225","subject":"Sample Workflow Help","startedAt":"2008-08-27T21:27:15Z","lastAt":"2008-08-27T21:27:15Z","messageCount":1,"participants":["issackelly"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"88789","messageId":"19190079.post@talk.nabble.com","threadId":"15225","inReplyTo":null,"subject":"Sample Workflow Help","fromName":"issackelly","fromEmail":"issac@servee.com","sentAt":"2008-08-27T21:27:15Z","receivedAt":"2008-08-27T21:27:15Z","isPatch":false,"sender":{"key":"issac@servee.com","avatar":null},"body":"\nI'm new to git.  I need some help refactoring my workflow.\n\nHere is my setup.\n\nThere are three of us working on one server, each with individual\nrepositories (clones) on the server (this is important because our test\nenvironment can't work from branches, it needs to work from actual files)\n\nso, there is the 1_1 folder (main repo)\n1_1issac for me\n1_1kasey and 1_1josh\n\nSo, here is my sample workflow\n\n--Begin doc\n\nI'm Issac.  I'm working on some calendar code, on my mac, it's at\n~/1_1issac/admin/pageType/calendar/admin.php (this is a clone of my\nrepository)\n\nI've made some local edits, to put it on the server I now do this (on my\nlocal terminal)\n\n    cd ~/1_1issac #my root directory\n\n    git commit -a #find all of my changes and commit them to the local\nrepository\n\n    git push ssh://<server>/<repoDir>/1_1issac\n\nNow, I've made a new icon at /admin/pageType/calendar/icon.png\n\ngit add admin/pageType/calendar/icon.png\n\ngit commit -a\n\ngit push ssh://<server>/<repoDir>/1_1issac\n\nI e-mail kasey \"Kasey, I've put a temp icon in the 1_1issac folder under\nadmin/pageType/calendar/icon.png could you give me a better one?\"\n\nHe does, first he jumps on the server and updates his current working files\nwith the things that I'm working on:\n\nssh <server>\ncd <repoDir>/1_1kasey\ngit pull ../1_1issac\nexit\n# your back to your regular environment now\ncd <wherever the stuff you normally work on it>\n\ngit pull ssh://<server>/<repoDir>/1_1kasey\n\n#edit my crapy paint drawing\n\ngit commit -a\n\ngit push ssh://<server>/<repoDir>/1_1kasey\n\n--end\n\nPlease tell me what I'm doing wrong (if anything) and what I could be doing\nbetter.  I've been using git for about two days, and I'm trying to teach my\nteam to as well.\n-- \nView this message in context: http://www.nabble.com/Sample-Workflow-Help-tp19190079p19190079.html\nSent from the git mailing list archive at Nabble.com.\n"}]}