i trying understand , learn how use subversion or git. recommend?
it seem complicated , confusing.
i lot of php web development projects. have habit backing project folders project_name_version_date
what best way learn beginner?
how upload updated project local machine live website different server, how done subversion / git? , reupload new version again?
can 2 or 3 people work on same project @ same time? load code files server? wouldn't conflict each other... had removed class objects, functions, etc.
what best way learn beginner?
how upload updated project local machine live website different server, how done subversion / git? , reupload new version again?
with version control, have central repository , 1 or more working copies (git adds in local repository @ every working copy allow distributed storage/management).
in case, live website , development copy both working copies - checkout central repository each of these locations. work on development copy, , commit changes central repository. once ready release, perform update on live working copy pulls changes central repository.
can 2 or 3 people work on same project @ same time? load code files server? wouldn't conflict each other... had removed class objects, functions, etc.
yes - each person has working copy make changes to.
conflicts likely, , happen time time - svn , git can deal lot easily. example, changes code in different places of same file merged in. changes code @ same place in same file typically require manual intervention.
perhaps worst conflicts can occur svn calls 'tree conflicts' - changes in folder structure. can real pita fix - have go out of way cause them.
that said, potential conflicts (and difficulty in resolving them) in non-version controlled environments far, far greater.
there practices prevent major conflicts occurring:
- modular code
- clear delineation of work - stop programmers treading on each others toes
- update local copy before committing
- commit small, commit - how small? hard say, start feel this... think in terms of functions , functionality.
i think git better start if don't use else - distributed system means more able resolve conflicts @ local level before pushing central repository. of projects use svn (at office , @ home), i'm starting use git through drupal project, , i've seen far.
Comments
Post a Comment