On 31/08/2018 1:45 PM, David Crayford wrote:
Using a distributed VCS like Git everybody has their own copy of the
source code so there is never a case off two people updating the same
file at the same time. Conflicts are detected when pushing changes and
that's when merging kicks in.
I bet git still has code and conventions to prevent 2 people committing
or pushing to the same repository/branch/etc simultaneously, and things
could break if you removed them.
I'm still learning git but have come across a number of situations where
they say "don't do this or you'll break things for everybody else" so
I'm not sure it should be a model solution.
And "everybody has their own copy" isn't a solution for everything -
typically at some point you have to agree on this is THE one true copy
(a system configuration file, a software release etc.) at which point
you're back to making sure that 2 people don't update at the same time.
--
Andrew Rowley
Black Hill Software
----------------------------------------------------------------------
For IBM-MAIN subscribe / signoff / archive access instructions,
send email to [email protected] with the message: INFO IBM-MAIN
