obsidian-plugin/silvanocerza_github-gitless-sync
1
0
Fork 0
mirror of https://github.com/silvanocerza/github-gitless-sync.git synced 2026-07-22 12:10:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Translate log conflict comment to English

Browse source
This commit is contained in:
tiagoarroz 2026-05-05 09:43:35 +01:00
parent bcf3369667
commit 5e3020e719
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/sync-manager.ts
View file

@ -460,10 +460,10 @@ export default class SyncManager {
.map((conflict) => ({
filePath: conflict.filePath,
content: conflict.localContent,
}));
}));
if (logConflictResolutions.length > 0) {
// Os logs são específicos de cada cofre e podem mudar em cada execução,
// por isso estes conflitos são resolvidos mantendo sempre o conteúdo local.
// Logs are specific to each vault and can change on every run,
// so these conflicts are always resolved by keeping local content.
await this.logger.info(
"Automatically resolved log conflicts",
logConflictResolutions.map((resolution) => resolution.filePath),