惯性聚合 高效追踪和阅读你感兴趣的博客、新闻、科技资讯
阅读原文 在惯性聚合中打开

推荐订阅源

Y
Y Combinator Blog
有赞技术团队
有赞技术团队
J
Java Code Geeks
H
Hackread – Cybersecurity News, Data Breaches, AI and More
美团技术团队
OSCHINA 社区最新新闻
OSCHINA 社区最新新闻
Hugging Face - Blog
Hugging Face - Blog
人人都是产品经理
人人都是产品经理
酷 壳 – CoolShell
酷 壳 – CoolShell
钛媒体:引领未来商业与生活新知
钛媒体:引领未来商业与生活新知
C
Check Point Blog
博客园 - 【当耐特】
The GitHub Blog
The GitHub Blog
Recent Announcements
Recent Announcements
The Cloudflare Blog
Microsoft Azure Blog
Microsoft Azure Blog
腾讯CDC
Vercel News
Vercel News
IT之家
IT之家
MyScale Blog
MyScale Blog
博客园_首页
Martin Fowler
Martin Fowler
WordPress大学
WordPress大学
罗磊的独立博客

Hacker News

GitHub - SeanFDZ/macmind: Single-layer transformer in HyperTalk for the classic Macintosh Show HN: Agent-cache – Multi-tier LLM/tool/session caching for Valkey and Redis Bonsai 1-bit WebGPU - a Hugging Face Space by webml-community Moving a large-scale metrics pipeline from StatsD to OpenTelemetry / Prometheus GitHub - Nightmare-Eclipse/RedSun: The Red Sun vulnerability repository GitHub - SethPyle376/hiraeth: Local AWS emulator focused on fast integration testing, with SQS support, SQLite-backed state, and a debug-friendly web UI. GitHub - macOS26/Agent: Any AI, replaces Claude Code, Cursor, OpenClaw. Over 18 LLM providers (Claude, OpenAI, Gemini, Ollama, Zai, HF, Qwen) wired into a native Mac app that writes code, builds Xcode projects, bumps versions, manages git, automates Safari, use AppleScript, JS or Accessibility, extend Agent! w/ MCP Servers, run tasks from your iPhone via Messages. YouTube now lets you turn off Shorts I Made a Terminal Pager Burgers | マクドナルド公式 Commands — HackerNews CLI documentation ChatGPT for Excel PiCore - Raspberry Pi Port of Tiny Core Linux Live Nation illegally monopolized ticketing market, jury finds Google Broke Its Promise to Me. Now ICE Has My Data. Founding Engineer at Adaptional | Y Combinator CRISPR takes important step toward silencing Down syndrome’s extra chromosome GitHub - saffron-health/libretto: The AI toolkit for building reliable browser automations US v. Heppner (S.D.N.Y. 2026) no attorney-client privilege for AI chats [pdf] Retrofitting JIT Compilers into C Interpreters IPv6 – Google The Accursèd Alphabetical Clock Cybersecurity Looks Like Proof of Work Now Fragments: April 14 Cal.com Goes Closed Source: Why AI Security Is Forcing Our Decision | Cal.com - Scheduling Software for Online Bookings Laravel raised money and now injects ads directly into your agent When moving fast, talking is the first thing to break Too much Discussion of the XOR swap trick – Heather Cafe Introduction to Spherical Harmonics for Graphics Programmers The Grand Line
weave — Merge without conflicts
2026-06-14 · via Hacker News

Entity-level semantic merge driver for Git. Two agents edit different functions in the same file? Clean merge. Every time.

# Two agents edited different functions

$ git merge feature-b
CONFLICT (content): Merge conflict in src/lib.ts
Automatic merge failed.

# Git sees overlapping lines.
# The functions don't actually overlap.
# Same merge, with weave configured

$ git merge feature-b
weave [src/lib.ts]:
  2 entities matched, 2 modified, 0 conflicts
Merge made by the 'ort' strategy.

# Different functions = no conflict.

copied $ brew install weave

31 out of 31.

31 merge scenarios across 7 languages. Full breakdown →

83 real-world wins

0 regressions on C, Python, Go

4,917 file merges tested

1,500+ downloads

Three layers

Use just the merge driver. Or add coordination for multi-agent workflows. Full docs →

MERGE

Merge Driver

Replaces git's line-level merge. Parses code with tree-sitter, merges by function and class.

COORDINATE

CRDT State

Agents claim entities before editing. Detect conflicts before they happen.

CONNECT

MCP Server

15 tools via Model Context Protocol. Claude and other AI agents call them directly.

28 languages

Entity extraction powered by sem-core and tree-sitter. Plus 5 data formats. Full list →

TypeScript JavaScript Python Go Rust Java C C++ C# Ruby PHP Swift Kotlin Elixir Bash HCL Fortran Dart Perl OCaml Scala Zig Vue Svelte XML ERB JSON YAML TOML CSV Markdown

Try it. 5 seconds.

$ brew install weave

$ cd my-project && weave setup
 Merge driver configured

$ git merge feature-branch
Merge made by the 'ort' strategy.