示例#1
0
  public static void resolve(VCSContext ctx) {
    StatusCache cache = Git.getInstance().getStatusCache();
    File[] files = cache.listFiles(ctx, StatusInfo.STATUS_VERSIONED_CONFLICT);

    resolveConflicts(files);

    return;
  }
示例#2
0
 public int compare(Setup setup1, Setup setup2) {
   int cmp =
       delegate.compare(
           cache.getStatus(setup1.getBaseFile()), cache.getStatus(setup2.getBaseFile()));
   if (cmp == 0) {
     return setup1.getBaseFile().getName().compareToIgnoreCase(setup2.getBaseFile().getName());
   }
   return cmp;
 }
示例#3
0
 @Override
 public boolean isEnabled() {
   StatusCache cache = Git.getInstance().getStatusCache();
   return cache.containsFileOfStatus(context, StatusInfo.STATUS_VERSIONED_CONFLICT);
 }