Skip to content

🐛 (alpha update): ensure that by default is used merge.conflictStyle=merge to facilitate the review #5039

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
merged 1 commit into from
Aug 24, 2025
Merged

🐛 (alpha update): ensure that by default is used merge.conflictStyle=merge to facilitate the review #5039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions docs/book/src/reference/commands/alpha_update.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,13 +146,12 @@ make all
### Changing Extra Git configs only during the run (does not change your ~/.gitconfig)_

By default, `kubebuilder alpha update` applies safe Git configs:
`merge.renameLimit=999999`, `diff.renameLimit=999999`.
`merge.renameLimit=999999`, `diff.renameLimit=999999`, `merge.conflictStyle=merge`
You can add more, or disable them.

- **Add more on top of defaults**
```shell
kubebuilder alpha update \
--git-config merge.conflictStyle=diff3 \
--git-config rerere.enabled=true
```

Expand Down
10 changes: 7 additions & 3 deletions pkg/cli/alpha/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Other options:
• --output-branch: override the output branch name.
• --push: push the output branch to 'origin' after the update.
• --git-config: pass per-invocation Git config as -c key=value (repeatable). When not set,
defaults to -c merge.renameLimit=999999 to improve rename detection during merges.
defaults are set to improve detection during merges.

Defaults:
• --from-version / --to-version: resolved from PROJECT and the latest release if unset.
Expand Down Expand Up @@ -92,7 +92,11 @@ Defaults:
}

// Defaults always on unless "disable" is present anywhere
defaults := []string{"merge.renameLimit=999999", "diff.renameLimit=999999"}
defaults := []string{
"merge.renameLimit=999999",
"diff.renameLimit=999999",
"merge.conflictStyle=merge",
}

hasDisable := false
filtered := make([]string, 0, len(gitCfg))
Expand Down Expand Up @@ -150,7 +154,7 @@ Defaults:
"git-config",
nil,
"Per-invocation Git config (repeatable). "+
"Defaults: -c merge.renameLimit=999999 -c diff.renameLimit=999999. "+
"Defaults: -c merge.renameLimit=999999 -c diff.renameLimit=999999 -c merge.conflictStyle=merge. "+
"Your configs are applied on top. To disable defaults, include `--git-config disable`")
return updateCmd
}
Loading