Conflicts - Combi Example

eMoflon · Oct 2, 2023 · 14db1c8 · 14db1c8
1 parent 0376bd4
commit 14db1c8
Show file tree

Hide file tree

Showing 6 changed files with 2,880 additions and 1 deletion.
diff --git a/doc/ibex/tgg/integrate-framework/11-conflicts-example.md b/doc/ibex/tgg/integrate-framework/11-conflicts-example.md
@@ -1,3 +1,11 @@
 # Conflicts: A combined example
 
-TODO
+![TGG](figures/conflict-combi-example/combi-example-tgg.drawio.svg)
+
+![Model](figures/conflict-combi-example/combi-example-model.drawio.svg)
+
+![Model Delta](figures/conflict-combi-example/combi-example-delta.drawio.svg)
+
+![PG Model](figures/conflict-combi-example/combi-example-pg-model.drawio.svg)
+
+![PG Delta](figures/conflict-combi-example/combi-example-pg-delta.drawio.svg)
diff --git a/...tegrate-framework/figures/conflict-combi-example/combi-example-delta.drawio.svg b/...tegrate-framework/figures/conflict-combi-example/combi-example-delta.drawio.svg
diff --git a/...tegrate-framework/figures/conflict-combi-example/combi-example-model.drawio.svg b/...tegrate-framework/figures/conflict-combi-example/combi-example-model.drawio.svg
diff --git a/...rate-framework/figures/conflict-combi-example/combi-example-pg-delta.drawio.svg b/...rate-framework/figures/conflict-combi-example/combi-example-pg-delta.drawio.svg
diff --git a/...rate-framework/figures/conflict-combi-example/combi-example-pg-model.drawio.svg b/...rate-framework/figures/conflict-combi-example/combi-example-pg-model.drawio.svg
diff --git a/...integrate-framework/figures/conflict-combi-example/combi-example-tgg.drawio.svg b/...integrate-framework/figures/conflict-combi-example/combi-example-tgg.drawio.svg