Merge branch 'main' into v2

* main: fix(config): properly apply defaults when reading folder configuration (#10034) chore(model): add metric for total number of conflicts (#10037) build: replace underscore in Debian version (#10032)
2025-04-04 19:05:08 +02:00
parent fa3b9acca3 f7c8efd93c
commit 7d51b1b620
5 changed files with 44 additions and 5 deletions
@@ -1809,6 +1809,7 @@ func (f *sendReceiveFolder) moveForConflict(name, lastModBy string, scanChan cha
 		return nil
 	}

+	metricFolderConflictsTotal.WithLabelValues(f.ID).Inc()
 	newName := conflictName(name, lastModBy)
 	err := f.mtimefs.Rename(name, newName)
 	if fs.IsNotExist(err) {