dotnet / Scaffolding

Code generators to speed up development.
MIT License
620 stars 218 forks source link

added code changes in json config and using IDbContextFactory now #2835

Closed deepchoudhery closed 4 days ago

deepchoudhery commented 4 days ago
deepchoudhery commented 4 days ago

/backport to release/8.0

github-actions[bot] commented 4 days ago

Started backporting to release/8.0: https://github.com/dotnet/Scaffolding/actions/runs/9750679526

github-actions[bot] commented 4 days ago

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

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

Applying: added code changes in json config and using IDbContextFactory now
.git/rebase-apply/patch:256: trailing whitespace.
           string areaName, 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M   src/Scaffolding/VS.Web.CG.EFCore/DbContextEditorServices.cs
M   src/Scaffolding/VS.Web.CG.EFCore/EntityFrameworkServices.cs
M   src/Scaffolding/VS.Web.CG.EFCore/IEntityFrameworkService.cs
M   test/Scaffolding/VS.Web.CG.Mvc.Test/ModelMetadataUtilitiesTest.cs
Falling back to patching base and 3-way merge...
Auto-merging test/Scaffolding/VS.Web.CG.Mvc.Test/ModelMetadataUtilitiesTest.cs
Auto-merging src/Scaffolding/VS.Web.CG.EFCore/IEntityFrameworkService.cs
Auto-merging src/Scaffolding/VS.Web.CG.EFCore/EntityFrameworkServices.cs
CONFLICT (content): Merge conflict in src/Scaffolding/VS.Web.CG.EFCore/EntityFrameworkServices.cs
Auto-merging src/Scaffolding/VS.Web.CG.EFCore/DbContextEditorServices.cs
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 added code changes in json config and using IDbContextFactory now
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

github-actions[bot] commented 4 days ago

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

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