mirror of
https://github.com/silvanocerza/github-gitless-sync.git
synced 2026-07-22 12:10:28 +00:00
Updated boolean for non-deletion cases in SyncManager determineSyncActions method
This commit is contained in:
parent
2ebd201da9
commit
698c30313f
1 changed files with 3 additions and 3 deletions
|
|
@ -724,12 +724,12 @@ export default class SyncManager {
|
|||
}
|
||||
}
|
||||
|
||||
// For non-deletion cases, if SHAs differ, we just need to check if local changed.
|
||||
// For non-deletion cases, if SHAs differ, we need to check if local changed and what file was modified last
|
||||
// Conflicts are already filtered out so we can make this decision easily
|
||||
if (localSHA !== localFile.sha) {
|
||||
if (localSHA !== localFile.sha && remoteFile.lastModified < localFile.lastModified) {
|
||||
actions.push({ type: "upload", filePath: filePath });
|
||||
return;
|
||||
} else {
|
||||
} else if(localSHA == localFile.sha && remoteFile.lastModified > localFile.lastModified) {
|
||||
actions.push({ type: "download", filePath: filePath });
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue