sequence-diagram.md

@@ -0,0 +1,40 @@
+```mermaid
+sequenceDiagram
+
+    actor Alice
+    actor Bob
+    actor Charlie
+    box AllSpice Server
+    participant AllSpice
+    end
+    Alice->>AllSpice: Push commit A
+    Bob->>AllSpice: Push commit B
+    Charlie->>AllSpice: Pull
+    Charlie->>Charlie: git checkout -b conflict-resolution
+    Charlie->>Charlie: git checkout <alice-commit-sha>
+    Charlie->>Charlie: git merge develop
+    Charlie->>Charlie: git push origin conflict-resolution
+    Charlie->>AllSpice: Create Design Review in AllSpice Web App
+    Charlie->>AllSpice: Open Alice and Bob's changes in DR or indivitual commits
+    Charlie->>Charlie: Manually resolve conflict in Schematic/PCB Editor
+    Charlie->>Charlie: Stage and commit the resolved design
+    Charlie->>Charlie: git add <path/to/resolved/file>
+    Charlie->>Charlie: git commit -m "Resolved ECAD merge conflict using AllSpice visual Diff"
+    Charlie->>AllSpice: git puish origin conflict-resolution
+    Alice->>AllSpice: Review changes in Design Review
+    Bob->>AllSpice: Review changes in Design Review
+    Charlie->>AllSpice: Review changes in Design Review
+    Charlie->>AllSpice: Merge branch confligt-resolution to develop
+    Alice->>Alice: git fetch origin
+    Alice->>Alice: git checkout develop
+    Alice->>Alice: git rebase origin/develop
+    Alice->>Alice: git rebase --continue
+    Alice->>Alice: git pull rebase
+    Alice->>Alice: git push origin develop
+
+
+
+
+```
+
+