feat: add merge mode to preserve existing customizations#2
Open
djscruggs wants to merge 1 commit intoblencorp:mainfrom
Open
feat: add merge mode to preserve existing customizations#2djscruggs wants to merge 1 commit intoblencorp:mainfrom
djscruggs wants to merge 1 commit intoblencorp:mainfrom
Conversation
Add --merge flag and interactive merge option to claude-setup installer, allowing users to preserve their customizations when re-running installation. Changes: - Add --merge flag to merge with existing .claude/ directory - Interactive mode now offers: Overwrite, Merge, or Cancel - Smart file merging for agents, commands, hooks, and skills - Skip existing files to preserve user customizations - Clear feedback showing files added vs. skipped - Update README with merge examples and behavior - Update CHANGELOG with feature documentation - Bump version to 0.3.0 Fixes issue where re-running installation would overwrite all custom agents, commands, and settings. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Adds
--mergeflag and interactive merge option to the claude-setup installer, allowing users to preserve their customizations when re-running installation.Changes
--mergeflag to merge with existing.claude/directoryProblem Solved
Fixes issue where re-running installation would overwrite all custom agents, commands, and settings. Users can now safely test the installation on existing repos without losing their customizations.
Usage Examples
```bash
Interactive merge
npx github:blencorp/claude-code-kit
Automatic merge mode
npx github:blencorp/claude-code-kit -- --merge
Force overwrite (previous behavior)
npx github:blencorp/claude-code-kit -- --force
```
Testing
Tested with merge mode to verify: