features: reduce risk of merge conflicts

Browse Source

Merge conflicts become less likely when:
- features are sorted alphabetically because
  then changes are more likely to be done in
  different parts of the files
- blank lines separate the hash entries because
  gofmt then doesn't change the formating of
  other entries when adding or removing one

Merge conflicts where pretty common shortly before a code freeze when everyone
added new features at the end of the files.

...

This commit is contained in:

Patrick Ohly

2022-04-12 15:46:53 +02:00

parent 9ac6b3af5f

commit 85513e4bca

3 changed files with 1177 additions and 1013 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1919

pkg/features/kube_features.go

File diff suppressed because it is too large Load Diff