From d2c277de1a3bb55050dcfef71cd3ee4ac3900f6c Mon Sep 17 00:00:00 2001 From: MikaChanical <mikachanical@noreply.hub.allspice.io> Date: Fri, 3 May 2024 03:46:45 +0000 Subject: [PATCH 1/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6575083..2b9b7c1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -## Simple directed graph example +## Simple directed graph example ```mermaid graph TB; A-->B; -- 2.45.2 From 3a93e41124c0486fd4e419c472ed287b6eddc8bc Mon Sep 17 00:00:00 2001 From: AllSpiceAlice <allspicealice@noreply.hub.allspice.io> Date: Wed, 8 Jan 2025 20:10:23 +0000 Subject: [PATCH 2/4] Upload files to "/" --- Git-graph.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 Git-graph.md diff --git a/Git-graph.md b/Git-graph.md new file mode 100644 index 0000000..f90915c --- /dev/null +++ b/Git-graph.md @@ -0,0 +1,16 @@ +```mermaid +--- +title: Example Git diagram +--- +gitGraph + commit + commit + branch develop + checkout develop + commit + commit + checkout main + merge develop + commit + commit +``` \ No newline at end of file -- 2.45.2 From ecbeb8eedd8abbf21fc6223a633e791183afde5f Mon Sep 17 00:00:00 2001 From: AllSpiceAlice <allspicealice@noreply.hub.allspice.io> Date: Wed, 8 Jan 2025 20:11:12 +0000 Subject: [PATCH 3/4] Add sequence-diagram.md --- sequence-diagram.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 sequence-diagram.md diff --git a/sequence-diagram.md b/sequence-diagram.md new file mode 100644 index 0000000..e69de29 -- 2.45.2 From 34bcf8ee58c31a3c75f69ea211fbc8e38de723aa Mon Sep 17 00:00:00 2001 From: AllSpiceAlice <allspicealice@noreply.hub.allspice.io> Date: Wed, 8 Jan 2025 20:35:36 +0000 Subject: [PATCH 4/4] Update sequence-diagram.md --- sequence-diagram.md | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/sequence-diagram.md b/sequence-diagram.md index e69de29..92cfbca 100644 --- a/sequence-diagram.md +++ b/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 + + + + +``` + + -- 2.45.2