You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
An upstream commit may have unrelated changes that don't apply.
In the squid case, the changes that went into the same commit as the desired chagnes were for .github/workflows.
We'd like to have some prettier way to do this.
The solution employed in both the above PRs was:
- runs: | git fetch origin master:master # Fix failure to build from source against new libxml2, without # nanohttp support. git show <COMMIT> -- FILE1 [FILE2 ...] > partial-cherry-pick.patch git apply partial-cherry-pick.patch
The documentation for git pipelines shows that the structure of the cherry-picks is:
I've seen this need twice in the past two days.
Once with squid wolfi-dev/os#25778 and once wolfi-dev/os#25652
An upstream commit may have unrelated changes that don't apply.
In the squid case, the changes that went into the same commit as the desired chagnes were for .github/workflows.
We'd like to have some prettier way to do this.
The solution employed in both the above PRs was:
The documentation for git pipelines shows that the structure of the
cherry-picks
is:That is unfortunately limiting, as we want to add some metadata (which files to ignore).
The text was updated successfully, but these errors were encountered: