Skip to main content
This page provides information about the following topics:
  • Version Control System (VCS) Hygiene
  • Upgrading Atoti FRTB
  • Merge

​
Version Control System (VCS) Hygiene

It is recommended to commit an unmodified version of the Solution before making any modifications. The repository should ideally be structured to take advantage of built-in merge tools when importing Atoti FRTB upgrades. This can be done by creating a branch which has the Atoti FRTB release without any custom changes made to it.

​
Importing the new version of the Solution

This section assumes the recommended practices in the Version Control System (VCS) Hygiene section are being followed.
  1. Check out the vendor branch from your VCS. This should contain Atoti FRTB the way it was delivered prior to any customization.
  2. Delete all the files from your local working copy
  3. Copy in the new version of Atoti FRTB.
  4. Commit your local working copy as the new version. Make sure the missing files are deleted from the repository and the new files are added.
The VCS repository now contains a copy of the new version of Atoti FRTB. More importantly, it is tracking the changes between versions of the Solution.

​
Merging

When the VCS branch containing the custom modifications has a previous version of Atoti FRTB as an ancestor, the VCS tools can merge the latest release into the branch containing those modifications. The merge will take the diffs between the two version of the Solution and attempt to apply them to the branch containing the modifications. There will almost certainly be conflicts; where both the Solution and the project have changed the same code. The number of conflicts and their complexity will depend on the nature of the changes to the Solution between versions. It also depends on how they interact with the custom modifications. The VCS tools will identify the conflicts and help to resolve them. Once the merge is complete, the VCS should be able to show how the project modifications differ from the Atoti FRTB release and how the project code changed following the import of the latest version of the Solution.
Version control example