dotnet / Scaffolding

Code generators to speed up development.
MIT License
638 stars 228 forks source link

update dependencies and separate versioning for dotnet-scaffolding #2952

Closed deepchoudhery closed 1 month ago

deepchoudhery commented 1 month ago
deepchoudhery commented 4 weeks ago

/backport to release/9.0-rc1

github-actions[bot] commented 4 weeks ago

Started backporting to release/9.0-rc1: https://github.com/dotnet/Scaffolding/actions/runs/10731995631

github-actions[bot] commented 4 weeks ago

@deepchoudhery backporting to release/9.0-rc1 failed, the patch most likely resulted in conflicts:

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

Applying: update dependencies and separate versioning for dotnet-scaffolding
Using index info to reconstruct a base tree...
M   eng/Versions.props
M   src/dotnet-scaffolding/Directory.Build.props
M   test/Scaffolding/VS.Web.CG.Core.Test/CodeGeneratorDescriptorTests.cs
Falling back to patching base and 3-way merge...
Auto-merging src/dotnet-scaffolding/Directory.Build.props
CONFLICT (content): Merge conflict in src/dotnet-scaffolding/Directory.Build.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 advice.mergeConflict false"
Patch failed at 0001 update dependencies and separate versioning for dotnet-scaffolding
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

github-actions[bot] commented 4 weeks ago

@deepchoudhery an error occurred while backporting to release/9.0-rc1, please check the run log for details!

Error: git am failed, most likely due to a merge conflict.

deepchoudhery commented 4 weeks ago

/backport to release/9.0-rc1

github-actions[bot] commented 4 weeks ago

Started backporting to release/9.0-rc1: https://github.com/dotnet/Scaffolding/actions/runs/10732210351

github-actions[bot] commented 4 weeks ago

@deepchoudhery backporting to release/9.0-rc1 failed, the patch most likely resulted in conflicts:

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

Applying: update dependencies and separate versioning for dotnet-scaffolding
Using index info to reconstruct a base tree...
M   eng/Versions.props
M   src/dotnet-scaffolding/Directory.Build.props
M   test/Scaffolding/VS.Web.CG.Core.Test/CodeGeneratorDescriptorTests.cs
Falling back to patching base and 3-way merge...
Auto-merging src/dotnet-scaffolding/Directory.Build.props
CONFLICT (content): Merge conflict in src/dotnet-scaffolding/Directory.Build.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 advice.mergeConflict false"
Patch failed at 0001 update dependencies and separate versioning for dotnet-scaffolding
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

github-actions[bot] commented 4 weeks ago

@deepchoudhery an error occurred while backporting to release/9.0-rc1, please check the run log for details!

Error: git am failed, most likely due to a merge conflict.