Skip to content

Conversation

@akhera99
Copy link
Member

@akhera99 akhera99 commented Feb 5, 2025

No description provided.

@akhera99 akhera99 requested a review from a team as a code owner February 5, 2025 01:54
@ghost ghost added Area-Infrastructure untriaged Issues and PRs which have not yet been triaged by a lead labels Feb 5, 2025
@akhera99 akhera99 merged commit 842cb1b into dotnet:release/dev17.14 Feb 5, 2025
28 checks passed
@akhera99
Copy link
Member Author

akhera99 commented Feb 5, 2025

/backport to release/dev17.13

@github-actions
Copy link
Contributor

github-actions bot commented Feb 5, 2025

Started backporting to release/dev17.13: https://github.com/dotnet/roslyn/actions/runs/13163488999

@akhera99
Copy link
Member Author

akhera99 commented Feb 5, 2025

/backport to release/dev17.12

@github-actions
Copy link
Contributor

github-actions bot commented Feb 5, 2025

Started backporting to release/dev17.12: https://github.com/dotnet/roslyn/actions/runs/13163495704

@github-actions
Copy link
Contributor

github-actions bot commented Feb 5, 2025

@akhera99 backporting to "release/dev17.12" failed, the patch most likely resulted in conflicts:

$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: update telemetry version
Using index info to reconstruct a base tree...
M	eng/Directory.Packages.props
Falling back to patching base and 3-way merge...
Auto-merging eng/Directory.Packages.props
CONFLICT (content): Merge conflict in eng/Directory.Packages.props
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 update telemetry version
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area-Infrastructure untriaged Issues and PRs which have not yet been triaged by a lead

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants