search

easywebhub / tasks

List of tasks for EasyWeb members
1 stars 4 forks source link

Error when Sync among PCs #52

Closed baotnq closed 7 years ago

baotnq commented 7 years ago

related with #50

Description

  1. The PC1 created, pushed a website to source, then the PC2 synchronized.
    • On PC1 added or edited some .md files, then Sync to source.easywebhub.com at commit, e.g commitA
    • On PC2, also added or edit .md files, then Sync from source
    • The changes on PC2 overide and pushed to source, at commitB. But we could not access commitA on source.easywebhub.com and could not rollback if needed
    • see more error by login to source.easywebhub.com, user: quocbao, pass on skype, repo eic-document

      Please check

    • The rule of sync from source,
    • keep local or keep remote?
    • should keep remote, clear the conflicts, then merge with local.