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

[CP #1794 > support/v5.12] Added script for creating License reviews with the eclipse-dash-licensing-tool #1796

Merged
merged 2 commits into from
Nov 14, 2024

Conversation

eclipse-ecal-bot
Copy link
Contributor

Cherry-pick failed

Cherry-picked PR #1794 to branch support/v5.12.
The cherry-pick has failed.

The following files have caused conflicts:

.gitignore

Resolving

Please resolve conflicts manually. You can use this PR and branch to your convenience.

git fetch origin
git checkout -b local/cherry-pick/9278997/support/v5.12 origin/support/v5.12
git branch -u origin/cherry-pick/9278997/support/v5.12
git cherry-pick 81a1e73c1f9dc340982ab6ad26b81ccb5755657c..9278997cd05d210a2862b46a976d9506a595f1d3

# Resolve conflicts and use
#     git cherry-pick --continue
# until all conflicts are resolved.

git push -f origin HEAD:cherry-pick/9278997/support/v5.12

After resolving all conflicts, rebase-merge this PR.

@FlorianReimold FlorianReimold force-pushed the cherry-pick/9278997/support/v5.12 branch from 88d9ed5 to 0fbdc73 Compare November 14, 2024 12:29
@FlorianReimold FlorianReimold marked this pull request as ready for review November 14, 2024 12:30
@FlorianReimold FlorianReimold merged commit ffd1cad into support/v5.12 Nov 14, 2024
15 of 16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants