Lock vs. Merge

• Lock:

  • Only one programmer can write to a source file at a time
  • No clashes/concurrency possible
  • Risk of unwanted lock-outs

• Merge:

  • Every programmer can write to every file at the same time
  • Concurrency has been found to be seldomly unresolvable
  • Risk of changes in the same section of the file

Notes: