mirror of
https://github.com/optim-enterprises-bv/kubernetes.git
synced 2026-01-09 08:42:08 +00:00
85513e4bca
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.