From d2101d65819e1258b3d46fb7471cb7f970672c45 Mon Sep 17 00:00:00 2001 From: Ryan Smith Date: Sun, 22 Mar 2026 10:38:39 -0400 Subject: [PATCH] Add squash-and-merge git workflow note to CLAUDE.md Co-Authored-By: Claude Opus 4.6 (1M context) --- CLAUDE.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CLAUDE.md b/CLAUDE.md index 0a5d034..c689d91 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -6,6 +6,10 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co **NorthPost Parser** — Canadian postal address parser library built with **ANTLR4** grammars. Parses free-form Canadian address text (English and French) into structured components (addressee, street, municipality, province, postal code, etc.). Pure Java library with no framework dependencies. +## Git Workflow + +GitHub is configured to **squash-and-merge** PRs. After a PR merges, use `git branch -D branch` (force delete) to clean up local branches — `git branch -d` will fail because the squashed commit has a different SHA than the branch's original commits. + ## Build & Test Commands ```bash