Page History

...

Before we begin...

Before we discuss team development concepts, there are some basic Servoy Concepts that we should review.

...

• Share (or sharing) - The act or command that allows a single developer to share their code with other developers.  This action creates a "link" between the developer's version of the code and the repository version of the code.
• Checkout - The act or command that allows a developer to bring code from the repository to the developer's local system for the first time, and effectively adds the developer to share the code. This action also creates a link between the developer's version of the code and the repository version of the code.
• Commit - When changes are made to any of the resources in a shared, local project, they are determined to be outgoing changes, which may be committed to the repository.  The commit command pushes these changes to the repository and any metadata about the commit (timestamp, comments, etc.).

• Update - Because a project is shared, one developer may have committed their own changes, which are not yet reflected in another developer's local copy. This action brings the incoming changes into the developer's local system, replacing the code with the repository version.

  Note
  NOTE: Both commits and updates only change the code when there is a change made. Example: If you update from the repository, it will only replace code that has been changed, not all of the code.

• Synchronize - The _synchronize_ process simply refers to the task of connecting with the remote repository and evaluating the net difference between local and repository copies. Allows the developer to view any changes (pending commits and updates) before they occur, as well as view any conflicts that may exist.
• Conflicts - A conflict will occur when a developer tries to commit changes to a resource which has also been modified by another developer since the last update. Conflicts are a common occurrence in team development and are usually no cause for concern. Conflicts do require a developer to resolve the conflict, although most team sharing systems will give the developer tools to make conflict resolution easier. Example
• Override and Update - a common command used during conflict resolution that will allow the developer to disregard outgoing changes on a local file and take the incoming changes on the repository file.
• Mark as Merged - a common command used during conflict resolution that will allow the developer to disregard incoming changes from the repository file and use the changes in the developer's local file.
• Database Information (DBI) Files - DBI files are text files that contain metadata about the database. These files are used in team development to keep every developer's database synchronized with each other.  In Servoy Developer, there are functions that will assist with using the DBI files to change the local developer's database.