-
Notifications
You must be signed in to change notification settings - Fork 1.8k
helm-charts: rebase helm-charts branch #14048
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.
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
Closed
valentijnscholten
wants to merge
10,000
commits into
DefectDojo:helm-charts
from
valentijnscholten:helm-charts-rebase
Closed
helm-charts: rebase helm-charts branch #14048
valentijnscholten
wants to merge
10,000
commits into
DefectDojo:helm-charts
from
valentijnscholten:helm-charts-rebase
Conversation
This file contains hidden or 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
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.
The
helm-chartsbranch is a couple of years behindmaster, this PR rebases the branch to make it up-to-date again. This can be important for github actions etc.Option to get it back in sync:
Merge
masterintohelm-chartsThis was tried in fix(helm): replace current helm-charts #13425 but resulted in a huge PR with 4042 changed files. At the time of writing it cannot always be viewed on Github.com, possibly because it's too big
Merge
helm-chartsintomaster(and then back intohelm-charts).I tried this, but this results in 200 conflicted files.
Rebase
helm-charts"from" `master".This is what this PR does. It looks pretty clean, no conflicts, only 1 file changed.
In theory after this rebase we could merge
helm-chartscleanly intomaster. But that would give 1268 helm chart commits onmasterwhich might not make sense. I think option 3 (this PR) is the safest way to ensure thehelm-chartsbranch catches up on 2+ years of changes frommaster.