mirror of
https://github.com/open-metadata/OpenMetadata.git
synced 2025-11-10 15:59:57 +00:00
Fix merge errors
This commit is contained in:
parent
7cdc63c8eb
commit
7ba449844a
@ -280,7 +280,7 @@ public abstract class EntityRepository<T> {
|
|||||||
Double newVersion = oldVersion;
|
Double newVersion = oldVersion;
|
||||||
if (majorVersionChange) {
|
if (majorVersionChange) {
|
||||||
newVersion = Math.round((oldVersion + 1.0) * 10.0)/10.0;
|
newVersion = Math.round((oldVersion + 1.0) * 10.0)/10.0;
|
||||||
} else if (!fieldsUpdated.isEmpty() || !fieldsAdded.isEmpty() || !fieldsDeleted.isEmpty()) {
|
} else if (fieldsChanged()) {
|
||||||
newVersion = Math.round((oldVersion + 0.1) * 10.0)/10.0;
|
newVersion = Math.round((oldVersion + 0.1) * 10.0)/10.0;
|
||||||
}
|
}
|
||||||
LOG.info("{}->{} - Fields added {}, updated {}, deleted {}",
|
LOG.info("{}->{} - Fields added {}, updated {}, deleted {}",
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user