aidan-user-claude

Merge the base branch into the current branch. Do the merge and resolve the safe parts first, then let a cheap signal decide how deep to look. Go past textual conflicts to semantic breaks, and past those to design consistency. When the base carries a refactor or redesign, bring the current branch into line with it (with the user's consent).

Provides Apex development workflow including static analysis and testing steps. Use before writing Apex classes or triggers

Access Salesforce Apex classes and schema objects. Use BEFORE writing Apex code to check what frameworks, utilities, or patterns are already available (e.g., trigger frameworks, selector patterns, service classes). Also use when you need to know object fields, System class methods, API signatures. Check this when asked to create triggers, services, or any new Apex to see if there's an existing framework to follow.

Use before writing Lightning Web Components.

Gets Claude to think about what went well and badly in a session with an eye on future improvements or lessons for the user.