Merge conflict resolution: sync-branch in config.yaml

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Steve Yegge
2025-11-30 11:16:50 -08:00
3 changed files with 89 additions and 81 deletions

View File

@@ -74,6 +74,7 @@ func Get(ctx context.Context, store storage.Storage) (string, error) {
}
// Check config.yaml (version controlled, shared across clones)
// This is the recommended way to configure sync branch for teams
if yamlBranch := config.GetString(ConfigYAMLKey); yamlBranch != "" {
if err := ValidateBranchName(yamlBranch); err != nil {
return "", fmt.Errorf("invalid %s in config.yaml: %w", ConfigYAMLKey, err)