Use newlines in config/generated.lst to prevent git conflicts #1245
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mbbush
force-pushed
the
newlines-in-generated-lst
branch
from
2da4a5e to
64cb97e
Compare
mbbush
force-pushed
the
newlines-in-generated-lst
branch
from
64cb97e to
52e4450
Compare
mbbush
force-pushed
the
newlines-in-generated-lst
branch
from
52e4450 to
2975e3c
Compare
Signed-off-by: Matt Bush <mbbush@gmail.com>
mbbush
force-pushed
the
newlines-in-generated-lst
branch
from
2975e3c to
11eca36
Compare
|
Thanks @turkenf. I rebased and resolved conflicts hopefully for the last time. I'll be AFK by the time the lint job finishes. Can you take care of clicking merge? |
Signed-off-by: Matt Bush <mbbush@gmail.com>
mbbush
force-pushed
the
newlines-in-generated-lst
branch
from
c55e4e3 to
9dc59d3
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of your changes
Currently, every pull request that adds a new resource kind modifies the one and only line of
config/generated.lst, which means that git finds a conflict between any two such pull requests.This change makes such PRs no longer be conflicting, by introducing newlines.
The only potential downside I can see here is that the conflict was serving as a sign that there were some additional changes that might impact the codegen, and you should rebase and rerun
make generate. But they're a poor way to indicate that. If we really want to ensure that, we can enforce a linear history, but I think simply running CI on main is probably good enough.This will also make it much easier to maintain that linear history, since you'll be able to git merge without having to rerun codegen, and the ci
check-diffjob will ensure you didn't miss anything.I have:
make reviewableto ensure this PR is ready for review.How has this code been tested