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.

Sign up for GitHub

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

Use git-cherry-pick to merge the upstream recipe commits #12

Closed
wants to merge 1 commit into from
Closed

Use git-cherry-pick to merge the upstream recipe commits #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions .github/workflows/merge-upstream.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,10 @@ jobs:
commit.committer_date = commit.author_date
' --force

- name: Rebase
run: |
git rebase -s ort -X ours ${{ steps.start.outputs.rev }}

- name: Merge into the original branch
- name: Cherry-pick the filtered commits
run: |
git switch ${{ matrix.base_ref }}
git merge --ff upstream-recipes
git cherry-pick --strategy ort -X theirs ..upstream-recipes

- name: Create a pull request
uses: peter-evans/create-pull-request@v5
Expand Down
Loading