Syncing upstream helm charts #15
Closed
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
* Packaged new Helm chart version Signed-off-by: Jorge Turrado <jorge.turrado@scrm.lidl> * fix typo Signed-off-by: Jorge Turrado <jorge.turrado@scrm.lidl> --------- Signed-off-by: Jorge Turrado <jorge.turrado@scrm.lidl>
If there is another thing to add to our fork, pls add it here. Example: ``` echo -e "#foo?\n\n bar?" > foo-bar.md # Pls keep adding the changes to standalone files that are not present in the upstream to mitigate the risk of conflict add foo-bar.md git commit -s --ammend yada yada ``` Signed-off-by: Jirka Kremser <jiri.kremser@gmail.com>
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.
馃摝 Syncing upstream helm chart 馃摝
The sync mechanism doesn't deal with releases.
馃 Rebase or merge?
Although merging is obviously better
, let's use rebasing for this sync.
This way we will see our custom tweaks nicely on the tip of the
main.馃彞 Conflict?
This could have happened only if the PR was opened for a long time and meanwhile there
was a change to this repo. 馃┕ Just close this PR and wait for the next one.
馃挕 Tip
Ideally, this repo has only one commits with all the necessary tweaks in it (like this gh action for instance).
So that we can keep adding the changes to this commit by
g commit --ammendand ideally the changes should be innew files so that the risk of conflict with the upstream repo is minimal.
馃敡 Important
Once this is merged, please don't forget to run this command if our 'All our tweaks should go here' commit is not on
top:
To reorder last two commits.
This automated PR was created by this action.