GIT and Github - howto.

[James Mcphee]

Git doesn't really allow file locking.  You'd have to have some good
communication to prevent working on the same file.  Or...  You can use the
merge process.  If the other person updates a file, pushes to the repo, and
you try to pull it in after you've updated same file, you will be told you
need to merge.  That can get messy, but git has no built-in way to lock a
file.

On Wed, Mar 7, 2012 at 4:36 PM, keith smith <klsmith2020 at yahoo.com> wrote:

>
>
> Hi,
>
> I have GIT installed on my server and I have Github.  I understand the
> versioning part.  The concept I am having trouble grasping is how I can use
> it a collaboration tool.
>
> It is just me and another programmer.  We both have a local dev
> environment.  We work out of our homes and we live a fair distance apart -
> about a 1.5 hour drive.
>
> We have a server in a data center that contains both our test server and
> our production server.
>
> To this point we have worked on separate parts of this online app so we
> have not had any occasion to step on what they other guy is doing.
>
> The two of us will be taking on a project that will require us to work
> within the same code set.
>
> What we need to achieve is a way to checkout a PHP file work on it and
> then check it back in.  While the file is checked no one else should be
> able to use it.
>
> I've been reading about GIT, however it is not clear if I can use it this
> way.
>
> Your guidance is much appreciated.
>
> ------------------------
> Keith Smith
> ---------------------------------------------------
> PLUG-discuss mailing list - PLUG-discuss at lists.plug.phoenix.az.us
> To subscribe, unsubscribe, or to change your mail settings:
> http://lists.PLUG.phoenix.az.us/mailman/listinfo/plug-discuss
>



-- 
James McPhee
jmcphe at gmail.com
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.PLUG.phoenix.az.us/pipermail/plug-discuss/attachments/20120307/5c289ee8/attachment.html>