addressalign-toparrow-leftarrow-rightbackbellblockcalendarcameraccwchatcheckchevron-downchevron-leftchevron-rightchevron-small-downchevron-small-leftchevron-small-rightchevron-small-upchevron-upcircle-with-checkcircle-with-crosscircle-with-pluscrossdots-three-verticaleditemptyheartexporteye-with-lineeyefacebookfolderfullheartglobegmailgoogleimageimagesinstagramlinklocation-pinmagnifying-glassmailminusmoremuplabelShape 3 + Rectangle 1outlookpersonplusprice-ribbonImported LayersImported LayersImported Layersshieldstartickettrashtriangle-downtriangle-uptwitteruseryahoo

December MNPHP: Version Control (Git/Github)

We can discuss the glory of things like git/github and how you can use them to bolster a PHP project. We can discuss why you shouldn't fear distributed VC and how it can help you work more fluidly. Pull requests can help you and your team create good code that tackels specific problems, and get consensus that the problem is fixed. We can discuss a theoretical deployment methodology for your code to go to one or many servers to keep with ideals of commit and deploy offten.

Join or login to comment.

  • Joe S.

    Great meetup and presentation tonight! I found the clarification about forking and using the pull request to be very helpful. I also though the discussion about "rebase" and its use was very enlightening. Thanks!

    December 6, 2012

    • Erik E.

      I 2nd this! Liked learning about the stash feature too.

      December 7, 2012

    • A former member
      A former member

      Thirded!

      December 7, 2012

  • Jonathan S.

    Sounds like everyone had a great time. Wish I was able to get back sooner from CodeWorks in Madison and stick around longer.

    December 7, 2012

  • Erik E.

    Excellent, exactly what I was hoping for and more. Love how you always learn something new when you hang out with smart people.

    December 7, 2012

  • Bill B.

    Great presentation. Covered a lot of material, with quite a mix of basic Git and some intermediate workflows.

    December 7, 2012

  • Maxwell V.

    I started a discussion for any lingering questions after this meeting.
    It is a large topic we talked about quite a bit, so if you have any more questions that you didn't get a chance to ask, post them in the discussion for Geoffre, myself, or anyone else to help with!

    http://www.meetup.com/mn-php/messages/boards/thread/29405512/#[masked]

    1 · December 7, 2012

  • Jacob S.

    Great presentation, this is obviously an *enormous* topic, especially if you are new to Git. I think Geoffrey did a good job considering how much info there is to cover.

    1 · December 7, 2012

  • A former member
    A former member

    Good but difficult to follow if you do not Git/Github. Show have been more like a class presentation with syntax examples.

    December 6, 2012

    • Geoffrey

      Anything i can elaborate on?

      December 7, 2012

  • Ketan K.

    Insightful presentation - probably fast paced for some, but hey there is only so much can be accommodated in 1.5 hours! I also enjoyed the Q&A part. We will finally start making use of our paid Github subscription for private repositories. :-)

    December 7, 2012

  • Sean K.

    very instructive

    December 7, 2012

  • Geoffrey

    Here is a link to the presentation: http://goo.gl/lfwGO

    Thanks everyone!!

    1 · December 6, 2012

  • A former member
    A former member

    Also a free alternative to github is GitLab http://gitlabhq.com/ This is for those who want a local git server without paying for the cost of github. It isn't quite as robust, but has some pretty good features to it.

    December 6, 2012

    • A former member
      A former member

      Another tool for those who want a free git client on the mac: http://www.sourcetree...­ (sorry windows people, this one is mac-only :/ )

      December 6, 2012

    • Geoffrey

      Source tree is pretty darn cool!! And gitlab is exactly what I was trying to remember.

      December 6, 2012

  • Dan

    Hi All, Im looking forward to the up coming github meeting! Also I am looking to collaborate with a PHP developer who has wordpress experience to do some plugin hacking. There will be some money in this as well. If anyone would like details find me at the meeting or email me at 'dan at gaiarendering.com'

    1 · December 3, 2012

  • Terry P.

    I would love to see some discussion (maybe at a future meeting) of how people use Git to version control a website. I've kind of just made my own way of doing it, but I am sure there are better ways...

    ---
    For example I have two git repos on the webserver. The first one (Repo 1) is bare and just for code. The second one (Repo 2) is where the actual webserver is located.

    Developers can push to Repo 1, making it an easy and centralized code repo. Once somebody has pulled the latest code from Repo 1 and tested it, I open up the master on repo 2 and pull in the code from repo 1.
    ---

    One thing I haven't decided on is how to version database structures. Maybe could do some sort of install file to be executed (like a wordpress famous 5 minute install).

    Anyway, I know this gets complicated and there probably are some genius gitters who have came up with even better methods. I'd love to hear them. See ya'all there.

    1 · November 15, 2012

    • Jacob S.

      Argh, these comments are just like Facebook -- enter submits it. Hmph!

      As for db control, we script *all* of our changes in files and then also automate their release. We use a flavor of db-migrate to accomplish this, and it's rather slick. Definitely would be cool to talk about all of this stuff and hear other's setups at a future meet-up.

      November 16, 2012

    • Terry P.

      Thanks for the tip on DB control... Regarding the two repos... If you use ssh to push to a central repo, you need to push to a bare repo. You cannot push directly to a non bare repo. However, a webserver needs a spot where it can actually read the files. So in that case, we need a non-bare repo on the web server. Hence the reason for two repos.

      November 28, 2012

  • Geoffrey

    @angie the presentation I have prepared takes us through the initial setup of git/github so I got that covered

    @daniel doing a live in room pull request demo would be great. We could have 2 or 3 people making pull requests and I can go through and approve / deny them. We can also setup an unclean merge and show how github handles those

    1 · November 2, 2012

    • Jonathan S.

      Yeah I like the idea of a live demo. Being the only one working on a project you don't always run into the gotchas

      November 2, 2012

    • Daniel J. P.

      Being the only one working on a project, I don't even get to work with merging or pull requests.

      November 3, 2012

  • A former member
    A former member

    Ooo. maybe I don't want to come, I live through this every week...

    November 2, 2012

  • Daniel J. P.

    If we agree to do this, I'll update the meetup description:
    What does everyone think about doing an "installfest" before the 7pm official start time, so that we can all be sure to play along with the presenter?
    I know many of us already have this tool and use it, but this is new to a lot of people and a hands-on/participation/demo might get people more comfortable with it.
    Reply to this comment & let me know what you think

    November 2, 2012

    • Daniel J. P.

      If we really want to go crazy we could create a group project (maybe a ZF2 Skeleton or my babysitting co-op project) and demo "pull" requests and merging changes (e.g. I make a change, and Geoffrey merges it, then everyone receives the updates).

      November 2, 2012

    • Tom G.

      Like the hands on idea. I'm really good at creating merge conflicts if you want to show how to resolve those :)

      1 · November 2, 2012

  • Erik E.

    I am also a SVN to GIT convert and love it, never going back if I can help it. I have never used GitHub, but have heard good things. I use Beansalk and wonder how it could be better? I love the visuals of Tower as well. However I only use the GIT basics, so very curious about many of the features offered?

    November 2, 2012

  • Geoffrey

    Just as an FYI, I talked to github and they are sending me some swag for my presentation whenever I give it.

    1 · October 23, 2012

    • Geoffrey

      I could do a 20-30 on the basics if a github repo and what a distributed vcs really is.

      October 23, 2012

    • Jonathan S.

      Funny enough I contacted GitHub when I gave the Subversion vs Git presentation about a year ago and got some swag from them as well. I think they sent me some stickers and a t-shirt.

      November 1, 2012

  • Jacob S.

    This would be a great meetup... We converted from SVN --> Git (on GitHub) this year, and I would never want to go back. We use it in tandem with Jenkins to do auto branching and such, so freakin' cool. People would have lots of good stuff to learn!

    2 · November 1, 2012

  • Daniel J. P.

    Yeah I just announced it for tonight (nov 1). So what?
    Show up December 6 and give me a hard time about it.
    Bring a friend.

    November 1, 2012

  • Daniel J. P.

    Even just "using git" is such a big, rich topic that we can probably get 2 40-minute presentations out of it.
    Am thinking we break it up into an intro/high level preso and a deep dive/advanced preso. Or like 20-30 minutes on how to set it up, and a different 20-30 minutes on using it as a social tool (eg pull).
    In any case this is a great topic for us to invite nonmembers to attend and cross-promote.

    September 7, 2012

    • Geoffrey

      Agreed. I am mostly versed in using git through Github. I understand its architecture very well but havent used it one on one without Github as an intermediary so i wont be very good for a deep dive presentation. I am more versed in a workflows individually and in teams across the various VCs. Also i know the different architectures and what teach VC is/was really trying to achieve with their design principals.

      September 7, 2012

  • Geoffrey

    Daniel and I talked about doing this in November. Nothing firm yet but that is on the table as of right now.

    September 7, 2012

  • Mike S.

    Awesome! Thanks Geoffrey! One of us will PM you shortly to figure out a date :)

    September 6, 2012

  • Geoffrey

    I sure could! I have been down the road with p4v, svn, and git/github. I am by no means a VCS expert but I do know a thing or 2

    September 6, 2012

  • Mike S.

    I love Git! It's so nice, I think this would be a great topic and a chance to dive into it a lot more. Geoffrey, would you be willing to present on this?

    September 6, 2012

55 went

Our Sponsors

  • The Nerdery

    We are a custom software design and development company

  • Wrox Press

    Receive 40% off Wrox Press titles.

  • O'Reilly

    User group members save 40% off print and 50% off ebooks. Code: DSUG

  • APress: sales@apress.com

    Receive a 35% discount off Apress books! Code: UGAPRESS mention mnphp

People in this
Meetup are also in:

Sign up

Meetup members, Log in

By clicking "Sign up" or "Sign up using Facebook", you confirm that you accept our Terms of Service & Privacy Policy