diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a42909..5bc7c22 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@ elfmem uses [Semantic Versioning](https://semver.org/).
 
 ---
 
-## [Unreleased]
+## [0.7.0] — 2026-04-28
 
 ### Added
 - **Theory of Mind (ToM) blocks:** New `mind` block category for modelling other agents' goals, beliefs, fears, motivations, and falsifiable predictions. Mind blocks use DURABLE decay tier (~6 month half-life). New API methods: `mind_create()`, `mind_predict()`, `mind_list()`, `mind_show()`, `mind_outcome()`.
diff --git a/CLAUDE.md b/CLAUDE.md
index dd5ce10..b4f8f28 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -117,6 +117,12 @@ git checkout main
 git reset --hard origin/main  # Discard local-only commits
 ```
 
+**If you get "divergent branches" on pull:** this means both local and remote have commits the other lacks. Configure rebase as the global default (once, per machine) so `git pull` always replays local commits on top of remote rather than prompting:
+```bash
+git config --global pull.rebase true
+```
+Then pull before committing whenever the branch has been pushed to by another machine or collaborator.
+
 **Why:** Protected main ensures all changes go through code review (PR), prevents accidental commits, and keeps release tags clean and authoritative.
 
 ## Public API
diff --git a/pyproject.toml b/pyproject.toml
index aee0f1e..43d1edf 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "elfmem"
-version = "0.6.0"
+version = "0.7.0"
 description = "Adaptive memory for LLM agents — adaptive decay, knowledge graph, zero infrastructure"
 readme = "README.md"
 requires-python = ">=3.11"