Eric at Lucii.org on 10 Dec 2010 09:04:24 -0800


[Date Prev] [Date Next] [Thread Prev] [Thread Next] [Date Index] [Thread Index]

[PLUG] new to git - have questions


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

New git user here.

Project is in git (yay!)

Two programmers are now going to work on it and I don't have a good idea of the
work flow.

Programmer A works on the widgets, B works on the core

Do we:

  create two branches, "new widgets" and "updated core", in the main repository
  each programmer pulls the branch from
                  modifies, adds, commits,
                  pushes back to their branch in the main repository
    (Merge takes place in the main repository)

- -OR-

  each programmer pulls the master and creates a local branch
                  modifies, adds, commits,
                  merges the new branch into their master
                  pushes the revised master  back to the main repository

- -OR-

Am I thinking about this wrong?


Thanks
Eric
- -- 
#  Eric Lucas
#
#                "Oh, I have slipped the surly bond of earth
#                 And danced the skies on laughter-silvered wings...
#                                        -- John Gillespie Magee Jr
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk0CXYYACgkQ2sGpvXQrZ/6TLwCfVsVdZcgTLE06Za6RWFc3BRHQ
hCQAn1TNj5YbmnHbSO9TTUbPDhnjSrnb
=Qy6A
-----END PGP SIGNATURE-----
___________________________________________________________________________
Philadelphia Linux Users Group         --        http://www.phillylinux.org
Announcements - http://lists.phillylinux.org/mailman/listinfo/plug-announce
General Discussion  --   http://lists.phillylinux.org/mailman/listinfo/plug