From 42040a9e327d07ff3ad38c0eb0a33e83c20e5591 Mon Sep 17 00:00:00 2001 From: MoritzWeber Date: Fri, 15 Sep 2023 15:35:35 +0200 Subject: [PATCH] docs(user): Add quick comparision of Capella co-working methods The co-working methods TeamForCapella and Git are compared in a table. --- .../settings/tools/capella/t4c-git-compare.md | 86 +++++++++++++++++++ docs/user/mkdocs.yml | 3 + 2 files changed, 89 insertions(+) create mode 100644 docs/user/docs/settings/tools/capella/t4c-git-compare.md diff --git a/docs/user/docs/settings/tools/capella/t4c-git-compare.md b/docs/user/docs/settings/tools/capella/t4c-git-compare.md new file mode 100644 index 000000000..b42771ebb --- /dev/null +++ b/docs/user/docs/settings/tools/capella/t4c-git-compare.md @@ -0,0 +1,86 @@ + + +# Ways of co-working on a Capella project + +## Quick comparision + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
GitTeamForCapella
Multiple workstreamsDifferent workstreams available via branchesNot recommended, only possible via different repositories
Concurrent workingVery challenging because of merge conflict potential.Is possible. Diagrams are locked, no risk of merge conflicts.
Merge conflictsResolution of merge conflicts can be challenging.No merge conflicts when one workstream is used. For multiple workstreams, the resolution of merge conflicts can be challenging.
LicenseNo license needed[^1]TeamForCapella license required[^2]
ComplexityGit knowledge is required[^3]Easy to use
StabilityVery stable solution as changes are initially saved locally. Temporary server downtimes can also be bridged.Changes may be lost if the server becomes unavailable during work.
Potential of data lossChanges are backed up after each push (more regularly).Changes are backed up on a nightly basis.
AutomationPossible via CI/CD in the Git repository.Possible via TeamForCapella → Git synchronisation (runs on a nightly basis).
Change controlReviews are possible via merge requests[^4]Change control is nearly impossible, no barriers.
Release taggingDirectly possible via tags in Git.Possible via TeamForCapella → Git synchronisation (Releases are stored as tags in the Git repository).
+ +[^1]: + You can use any standardized Git server. Depending on the server used, + licenses for the Git server may be required. + +[^2]: + You need a valid TeamForCapella license and TeamForCapella server installed + and integrated in the Collaboration Manager. + +[^3]: + For the basic workflow, a simple Git knowledge that includes commit, pull + and push is sufficient. However, it is necessary to have at least one Git + expert in the project to deal with potential merge conflicts and unexpected + situations. + +[^4]: + To review changes, the Eclipse EMF diff/merge tool can be used. However, in + practice this proves to be too time-consuming, as many changes become + confusing very quickly. diff --git a/docs/user/mkdocs.yml b/docs/user/mkdocs.yml index 575b7e3ad..447671e4f 100644 --- a/docs/user/mkdocs.yml +++ b/docs/user/mkdocs.yml @@ -51,6 +51,7 @@ nav: - General: settings/tools/index.md - pure::variants: settings/tools/pure_variants.md - Capella: + - Co-working methods: settings/tools/capella/t4c-git-compare.md - TeamForCapella: - Import a model from TeamForCapella: settings/tools/capella/teamforcapella/import/import-from-t4c.md - Export a model to TeamForCapella: settings/tools/capella/teamforcapella/export/export-to-t4c.md @@ -73,9 +74,11 @@ markdown_extensions: - admonition - pymdownx.details - pymdownx.superfences + - pymdownx.extra - abbr - pymdownx.snippets - attr_list + - footnotes - pymdownx.emoji: emoji_index: !!python/name:materialx.emoji.twemoji emoji_generator: !!python/name:materialx.emoji.to_svg