Christoph
f0ff1914c9
Add the generated Gitty runtime architecture documentation produced by archify: rendered HTML, JSON specification and delivery/browser receipts, visual-check screenshots and contact sheets, and accompanying diagram JSON/visual files under docs/diagrams. These are auto-generated static documentation artifacts (archify metadata present) and should not be edited by hand.
144 lines
2.8 KiB
JSON
144 lines
2.8 KiB
JSON
{
|
|
"schema_version": 1,
|
|
"diagram_type": "lifecycle",
|
|
"meta": {
|
|
"title": "Gitty · Merge und Konfliktauflösung",
|
|
"quality_profile": "showcase",
|
|
"viewBox": [
|
|
980,
|
|
630
|
|
],
|
|
"legend": {
|
|
"entries": {
|
|
"start": {
|
|
"label": "Start"
|
|
},
|
|
"active": {
|
|
"label": "Aktiv"
|
|
},
|
|
"waiting": {
|
|
"label": "Wartend"
|
|
},
|
|
"success": {
|
|
"label": "Erfolgreich"
|
|
},
|
|
"neutral": {
|
|
"label": "Beendet"
|
|
}
|
|
}
|
|
}
|
|
},
|
|
"lanes": [
|
|
{
|
|
"id": "main",
|
|
"label": "Normaler Merge · Konfliktpfad"
|
|
},
|
|
{
|
|
"id": "user",
|
|
"label": "Nutzeraktion"
|
|
},
|
|
{
|
|
"id": "terminal",
|
|
"label": "Abbruch"
|
|
}
|
|
],
|
|
"states": [
|
|
{
|
|
"id": "ready",
|
|
"type": "start",
|
|
"label": "Bereit",
|
|
"sublabel": "Branch ausgewählt",
|
|
"lane": "main",
|
|
"col": 0
|
|
},
|
|
{
|
|
"id": "merging",
|
|
"type": "active",
|
|
"label": "Merge läuft",
|
|
"sublabel": "git merge --no-edit",
|
|
"lane": "main",
|
|
"col": 1
|
|
},
|
|
{
|
|
"id": "conflicts",
|
|
"type": "waiting",
|
|
"label": "Konflikte offen",
|
|
"sublabel": "Nutzereingriff nötig",
|
|
"lane": "main",
|
|
"col": 2
|
|
},
|
|
{
|
|
"id": "resolved",
|
|
"type": "active",
|
|
"label": "Alles aufgelöst",
|
|
"sublabel": "Änderungen vorgemerkt",
|
|
"lane": "main",
|
|
"col": 3
|
|
},
|
|
{
|
|
"id": "done",
|
|
"type": "success",
|
|
"label": "Abgeschlossen",
|
|
"sublabel": "Status aktualisiert",
|
|
"lane": "main",
|
|
"col": 4
|
|
},
|
|
{
|
|
"id": "aborted",
|
|
"type": "neutral",
|
|
"label": "Abgebrochen",
|
|
"sublabel": "Vorheriger Stand",
|
|
"lane": "terminal",
|
|
"col": 0
|
|
}
|
|
],
|
|
"transitions": [
|
|
{
|
|
"id": "clean-merge",
|
|
"from": "merging",
|
|
"to": "done",
|
|
"label": "Ohne Konflikte",
|
|
"variant": "emphasis",
|
|
"fromSide": "top",
|
|
"toSide": "top",
|
|
"route": "top-channel"
|
|
},
|
|
{
|
|
"id": "abort-merge",
|
|
"from": "conflicts",
|
|
"to": "aborted",
|
|
"label": "Abbrechen",
|
|
"variant": "security",
|
|
"fromSide": "bottom",
|
|
"toSide": "top",
|
|
"labelAt": [
|
|
402,
|
|
202
|
|
]
|
|
}
|
|
],
|
|
"cards": [
|
|
{
|
|
"dot": "cyan",
|
|
"title": "Konflikte sind ein Zustand",
|
|
"items": [
|
|
"Konflikte sind GitStatus. Ohne Konflikte endet der Merge direkt."
|
|
]
|
|
},
|
|
{
|
|
"dot": "amber",
|
|
"title": "Auflösen & Fortsetzen",
|
|
"items": [
|
|
"Speichern → git add. Alles gelöst → Fortsetzen → git commit --no-edit."
|
|
]
|
|
},
|
|
{
|
|
"dot": "rose",
|
|
"title": "Abbruch & Geltungsbereich",
|
|
"items": [
|
|
"git merge --abort beendet den laufenden Merge. Squash ist hier ausgenommen."
|
|
]
|
|
}
|
|
]
|
|
}
|