notanamber/masy
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

sync

Browse Source
This commit is contained in:
Amber 2024-10-26 21:07:58 +02:00
parent 4127df814b
commit bbb962a32f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/iface/sync_manager.py
View File

@ -509,9 +509,10 @@ class Manager():
unmerged_path = self.get_unmerged_path()
if os.listdir(unmerged_path):
print('You have this unmerged file(s), if you want to proceed with sync, fix it:\n')
self.show_conflicts()
return
if self.load_unmerged_diff():
print('You have this unmerged file(s), if you want to proceed with sync, fix it:\n')
self.show_conflicts()
return
local_snap_diff = self.get_local_snap_diff()
local_tree = self.load_local_hash()