Skip to content
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

Enhance rebase support on upstreams #31

Open
aiyengar2 opened this issue Mar 30, 2021 · 2 comments
Open

Enhance rebase support on upstreams #31

aiyengar2 opened this issue Mar 30, 2021 · 2 comments
Assignees

Comments

@aiyengar2
Copy link
Contributor

aiyengar2 commented Mar 30, 2021

Support a workflow that makes it easier to be able to rebase existing patches on a chart to a new package.yaml upstream.

Add a Bash script to help interactively perform rebases on upstreams using git subtree and bash shell

Edit: See below.

@aiyengar2 aiyengar2 self-assigned this Mar 30, 2021
@aiyengar2 aiyengar2 changed the title Enhance rebase support on upstreams Enhance rebase support on upstreams for Git-based packages Mar 30, 2021
@aiyengar2 aiyengar2 added this to the v2.x milestone Jun 3, 2021
@aiyengar2
Copy link
Contributor Author

PR is already ready to go for this, we just need more testing for it.

@aiyengar2
Copy link
Contributor Author

In favor of using the bash scripts, an implementation is described in #76 (comment) wherein we perform a weave merge in order to rebase to an upstream, which is 1) far better / more efficient than the existing solution of utilizing git subtrees and cherry-picking commits and 2) capable of supporting rebases outside of just Git-based packages

@aiyengar2 aiyengar2 changed the title Enhance rebase support on upstreams for Git-based packages Enhance rebase support on upstreams Feb 2, 2022
@deniseschannon deniseschannon removed this from the 0.4.x milestone Oct 31, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

4 participants