Merge branch 'master' of github.com:flancian/garden

.obsidian/workspace

@@ -36,17 +36,39 @@
             ],
             "direction": "vertical"
           },
+          {
+            "id": "861ef2709bc88251",
+            "type": "split",
+            "children": [
               {
                 "id": "7f4febbb4b6a9e6d",
                 "type": "leaf",
                 "state": {
                   "type": "markdown",
                   "state": {
-                "file": "2021-05-26.md",
+                    "file": "reading alexander.md",
                     "mode": "source"
                   }
                 }
               },
+              {
+                "id": "e96139be9a5208c5",
+                "type": "leaf",
+                "state": {
+                  "type": "markdown",
+                  "state": {
+                    "file": "conflict-files-obsidian-git.md",
+                    "mode": "source"
+                  }
+                }
+              }
+            ],
+            "direction": "vertical"
+          },
+          {
+            "id": "68e81b5f03f48b15",
+            "type": "split",
+            "children": [
               {
                 "id": "b2d0be3b2866e3eb",
                 "type": "leaf",
@@ -68,7 +90,14 @@
                     "mode": "source"
                   }
                 }
+              }
+            ],
+            "direction": "vertical"
           },
+          {
+            "id": "48e5a96610f666cb",
+            "type": "split",
+            "children": [
               {
                 "id": "07bb2929b930eb3c",
                 "type": "leaf",
@@ -92,6 +121,9 @@
                 }
               }
             ],
+            "direction": "vertical"
+          }
+        ],
         "direction": "horizontal"
       }
     ],
@@ -157,7 +189,7 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "2021-05-26.md",
+                "file": "reading alexander.md",
                 "collapseAll": false,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -174,7 +206,7 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "2021-05-26.md"
+                "file": "reading alexander.md"
               }
             }
           }
@@ -187,15 +219,15 @@
   },
   "active": "7f4febbb4b6a9e6d",
   "lastOpenFiles": [
-    "2021-05-26.md",
     "reading alexander.md",
-    "pattern chosen.md",
-    "patterns.md",
+    "2021-05-26.md",
     "patterning.md",
+    "patterns.md",
+    "pattern chosen.md",
+    "conflict-files-obsidian-git.md",
     "metabolist.md",
     "catalog.md",
     "for.md",
-    "remarkable 2.md",
-    "mantequillas.md"
+    "remarkable 2.md"
   ]
 }

conflict-files-obsidian-git.md

@@ -0,0 +1,3 @@
+# Conflict files
+Please resolve them and commit per command (This file will be deleted before the commit).
+- Not a file: .obsidian/workspace

patterns.md

@@ -5,3 +5,6 @@
 	- [[pull]] [[pattern]]
 	- [[a pattern language]]
 		- [[1]] [[independent regions]]
+		- [[the countryside]]
+		- [[carnival]]
+		- [[filtered light]]

reading alexander.md

@@ -10,6 +10,15 @@
 - proposal: design a space following the example in the introductory material? 10-20 patterns combined.
 	- [[xxxv]] for example
 	- [[xxxviii]] for [[procedure]]
+	- [[code]] a generator?
+		- fit between patterns seems represented by recommended patterns at higher and lower level?
+	- [[armengol]] some problems perhaps
+		- we need to imagine a need for building something? what would be the context for the exercise?
+- [[andras]]
+	- pattern: [[filtered light]]
+	- would probably recommend people just go to [[a pattern language]] directly, it seems to be self-contained
+- [[armengol]]
+	- pattern
 
 ## [[2021-05-12]]
 - [[ttwob]]