Method: Cnvrg::Datafiles#mark_conflicts

Defined in:
lib/cnvrg/datafiles.rb

#mark_conflicts(results) ⇒ Object 



59
60
61
62
63
64
65
66
67
68
69
70
71
 
# File 'lib/cnvrg/datafiles.rb', line 59

def mark_conflicts(results)
  begin
    updated = results["updated_on_server"]
    deleted = results["deleted"]
    resolver = results['resolved_files']
    overall = 0
    overall += self.check_files_sha1(updated, resolver, "conflict")
    overall += self.check_files_sha1(deleted, resolver, "deleted")
    overall
  rescue => e
    0
  end
end