This page provides information about the following topics:Documentation Index
Fetch the complete documentation index at: https://docs.activeviam.com/llms.txt
Use this file to discover all available pages before exploring further.
- Version Control System (VCS) Hygiene
- Upgrading
- Merge
Version Control System (VCS) Hygiene
We recommend committing an unmodified version of the Solution before making any modifications. Your repository should ideally be structured to take advantage of built-in merge tools when importing upgrades. This can be done by creating a branch which has the release without any custom changes made to it.Upgrading the Solution
This section assumes you have used the above recommended VCS Hygiene.Importing the new version of the Solution
This sections assumes you are following the recommended VCS Hygiene.- Check out the vendor branch from your VCS. This should contain the way it was delivered prior to any customization.
- Delete all the files from your local working copy
- Copy in the new version of .
- 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.
Merging
Assuming the VCS branch containing your custom modification has a previous version of as an ancestor, you can use your VCS tools to merge the latest release into the branch containing your modifications. The merge will take the diffs between the two version of the Solution and attempt to apply them to the branch containing your modifications. There will almost certainly be conflicts; where both the Solution and your 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, and how they interact with your custom modifications. Your VCS tools will identify the conflicts and help you to resolve them. Once the merge is complete, your VCS should be able to tell you how the project modifications differ from the release and how your project code changed following the import of the latest version of the Solution.