Skip to content

Gitbutler/workspace #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
May 17, 2025
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
的的
  • Loading branch information
andrewbytecoder committed May 14, 2025
commit d3d9d2530cf071bc77a1be64a459432fe069e847
87 changes: 87 additions & 0 deletions .obsidian/workspace.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,56 @@
"icon": "lucide-file",
"title": "架构设计"
}
<<<<<<< HEAD
}
]
=======
},
{
"id": "20d96e3062f4291e",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "架构/架构设计.md",
"mode": "source",
"source": false
},
"icon": "lucide-file",
"title": "架构设计"
}
},
{
"id": "b7d07db209d422b0",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "架构/分布式.md",
"mode": "source",
"source": false
},
"icon": "lucide-file",
"title": "分布式"
}
},
{
"id": "420f6196d6d3217b",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "go/go_package.md",
"mode": "source",
"source": false
},
"icon": "lucide-file",
"title": "go_package"
}
}
],
"currentTab": 3
>>>>>>> 4c6aa2b40d938ef60263e8b0a1d6253dc40d00d4
}
],
"direction": "vertical"
Expand Down Expand Up @@ -142,13 +190,21 @@
"state": {
"type": "outline",
"state": {
<<<<<<< HEAD
"file": "架构/架构设计.md",
=======
"file": "go/go_package.md",
>>>>>>> 4c6aa2b40d938ef60263e8b0a1d6253dc40d00d4
"followCursor": false,
"showSearch": false,
"searchQuery": ""
},
"icon": "lucide-list",
<<<<<<< HEAD
"title": "Outline of 架构设计"
=======
"title": "go_package 的大纲"
>>>>>>> 4c6aa2b40d938ef60263e8b0a1d6253dc40d00d4
}
}
],
Expand All @@ -169,6 +225,7 @@
"command-palette:Open command palette": false
}
},
<<<<<<< HEAD
"active": "5c8b7f1f1f2346fa",
"lastOpenFiles": [
"架构/分布式.md",
Expand All @@ -190,6 +247,36 @@
"eBPF/bcc.md",
"calico/calico架构.md",
"calico/calicoctl.md",
=======
"active": "420f6196d6d3217b",
"lastOpenFiles": [
"go/go_module.md",
"go/go.md",
"架构/知识学习模板.md",
"架构/分布式.md",
"middleware/redis.md",
"eBPF/ebpf.md",
"eBPF/bpftrace.md",
"k8s/kubernetes.md",
"containerd/docker.md",
"架构/架构设计.md",
"calico/calico.md",
"架构/().md",
"go/高并发.md",
"go/go_package.md",
"go/gRPC.md",
"go/memory.md",
"calico/calico架构.md",
"middleware/etcd.md",
"db/DBA(Database administrator).md",
"linux/memory.md",
"linux/linux.md",
"linux/Pasted image 20250430140606.png.md",
"linux/perf.md",
"k8s/kube_state_metirc.md",
"k8s/kube_prometheus.md",
"k8s/harbor.md",
>>>>>>> 4c6aa2b40d938ef60263e8b0a1d6253dc40d00d4
"k8s/attachments/Pasted image 20250430202140.png",
"k8s/attachments/Pasted image 20250430202042.png",
"k8s/attachments/Pasted image 20250430201959.png",
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.