golang/ent
1
0
Fork 0
mirror of https://github.com/ent/ent.git synced 2026-05-24 09:31:56 +03:00
Code Issues Packages Projects Releases Wiki Activity
Files
39bcbbc359df57faabc9374ee79a1ced16f22576
ent/entc/entc.go
Jannik Clausen 7d72a2864d entc/gen: resolve merge conflicts on file load (#4313) 
If there is no conflict in the schema, the existing logic will not attempt to resolve a conflict. Therefore, if there is a conflict on file load, there now also is an attempt to fix the conflict.
2025-01-27 09:38:20 +01:00

12 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink