mirrors/pferd
1
0
Fork 0
mirror of https://github.com/Garmelon/PFERD.git synced 2023-12-21 10:23:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use the least destructive conflict resolver if there are multiple

Browse Source
This commit is contained in:
I-Al-Istannen 2020-12-06 13:28:08 +01:00
parent f47b137b59
commit 93e6329901
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sync_url.py
View File

@ -129,12 +129,12 @@ def main() -> None:
return element not in [IliasElementType.VIDEO_FILE, IliasElementType.VIDEO_FOLDER] return element not in [IliasElementType.VIDEO_FILE, IliasElementType.VIDEO_FOLDER]
return True return True
if args.remote_first: if args.local_first:
file_confilict_resolver: FileConflictResolver = _resolve_remote_first file_confilict_resolver: FileConflictResolver = _resolve_local_first
elif args.local_first:
file_confilict_resolver = _resolve_local_first
elif args.no_delete: elif args.no_delete:
file_confilict_resolver = _resolve_no_delete file_confilict_resolver = _resolve_no_delete
elif args.remote_first:
file_confilict_resolver = _resolve_remote_first
else: else:
file_confilict_resolver = resolve_prompt_user file_confilict_resolver = resolve_prompt_user