Question about Index.conflictGet method #1193

Activity

1. zyu539

   changed the title [-]Question about Index.conflictAdd method[/-] [+]Question about Index.conflictGet method[/+] on Jan 22, 2017
2. rcjsuen commented on Jan 23, 2017

   

   rcjsuen

   on Jan 23, 2017

   Member

   More actions

   @zyu539 The conflictGet(*) function only has one parameter in the promise but you can actually get all three IndexEntry instances from the parameter. Please see below.

   index.conflictGet("newFile.txt").then(function(conflict) {
     console.log(conflict.ancestor_out);
     console.log(conflict.our_out);
     console.log(conflict.their_out);
   }).catch(function(err) {
     console.log(err);
   });