Skip to content

fix: suppress repeated field collision warnings on subsequent syncs #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sthadka merged 2 commits into from
Jul 27, 2026
Merged

fix: suppress repeated field collision warnings on subsequent syncs #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0e77be
fix: suppress repeated field collision warnings on subsequent syncs
sthadka Jul 27, 2026
6197e4e
docs: add SSH-to-HTTPS fallback for git push in CLAUDE.md
sthadka Jul 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CLAUDE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,4 +156,13 @@ bd close <id> # Complete work
- NEVER stop before pushing - that leaves work stranded locally
- NEVER say "ready to push when you are" - YOU must push
- If push fails, resolve and retry until it succeeds
- **SSH fallback**: If `git push` fails with SSH key errors, switch to HTTPS via `gh`:
```bash
gh config set git_protocol https
git remote set-url origin https://github.com/sthadka/jai.git
git push
# Restore SSH after:
gh config set git_protocol ssh
git remote set-url origin git@github.com:sthadka/jai.git
```
<!-- END BEADS INTEGRATION -->
14 changes: 13 additions & 1 deletion internal/sync/engine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,19 @@ func (e *Engine) DiscoverFields(ctx context.Context, overrides map[string]string
if f.Schema == nil {
continue
}
name := inferColumnName(f, overrides)

// If this field already has a stored name, reuse it to avoid
// re-triggering collision warnings on every sync.
name := ""
if em, ok := existing[f.ID]; ok {
name = em.Name
}
if overrideName, ok := overrides[f.ID]; ok {
name = overrideName
}
if name == "" {
name = inferColumnName(f, overrides)
}
fieldType := jiraSchemaToType(f.Schema)

// If this name is already owned by a different field, append a suffix
Expand Down
Loading