Git detects merge conflicts and will reject push requests. Our git
repositories are in Bitbucket and we use pull requests. Nothing gets
merged into master without going through a code review. I can assure you
that the quality of our development process
has gone up exponentially with the adoption of tools like Git/Bitbucket.
Bitbucket integrates with our Jira system so each feature branch in Git
has an associated Jira ticket which when integrated with
Bitbucket can track every line of code that has been changed. I still
have to work on projects that use our traditional mainframe VCS and PDS
data sets and it really does feel like rubbing two sticks together!
On 31/08/2018 12:21 PM, Andrew Rowley wrote:
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.
----------------------------------------------------------------------
For IBM-MAIN subscribe / signoff / archive access instructions,
send email to [email protected] with the message: INFO IBM-MAIN
