Conversation
There was a problem hiding this comment.
Pull request overview
This PR configures git to ignore the .beads directory and sets up a custom merge driver for beads JSONL issue tracking files. The PR title "ignore beads" suggests the primary goal is to exclude the beads directory from version control, with the merge driver configuration as a secondary enhancement for handling conflicts in beads issue files.
Changes:
- Added
.beadsdirectory to.gitignoreto exclude it from version control - Configured a custom
beadsmerge driver in.gitattributesfor.beads/issues.jsonlfiles
Reviewed changes
Copilot reviewed 1 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| .gitignore | Added .beads to ignore the beads directory and its contents |
| .gitattributes | Added merge driver configuration for .beads/issues.jsonl files with a custom beads merge strategy |
| # MARC binary | ||
| *.mrc binary -linguist-detectable | ||
|
|
||
| # Use bd merge for beads JSONL files |
There was a problem hiding this comment.
The comment says "Use bd merge" but should say "Use beads merge" to accurately describe the merge driver being configured.
| # Use bd merge for beads JSONL files | |
| # Use beads merge for beads JSONL files |
| # Use bd merge for beads JSONL files | ||
| .beads/issues.jsonl merge=beads |
There was a problem hiding this comment.
The .gitattributes file references a 'beads' merge driver, but this merge driver needs to be configured in the user's git config for it to work. Without the corresponding git config setup (e.g., git config merge.beads.driver "..." or in a .gitconfig file), git will fail to merge these files when conflicts occur. Consider adding documentation or setup instructions in the README, CONTRIBUTING.md, or a dedicated setup script to configure this merge driver, or include a .gitconfig file in the repository that developers can reference.
| # Use bd merge for beads JSONL files | |
| .beads/issues.jsonl merge=beads | |
| # beads JSONL files will use the default merge driver | |
| # (custom 'beads' merge driver removed to avoid requiring extra git config) |
|
I've also been wondering how to deal with these changes since I'm using beads as well. I think it's a good idea to merge this as it is. Thanks for doing it! |
This pull request updates the
.gitattributesfile to specify a custom merge driver for beads JSONL files. This ensures that files matching.beads/issues.jsonlwill use thebeadsmerge driver during merges, which can help resolve conflicts more intelligently for these files.Configuration changes:
.gitattributes: Added a rule to use thebeadsmerge driver for.beads/issues.jsonlfiles.