Verified Owner
Top Classes
module org.jabref.jablib

Package org.jabref.logic.git.model

Class Summary

Modifier and TypeClass and Description
public class
BookkeepingResult

This is the return value of the bookkeeping layer, org.jabref.logic.git.merge.execution.MergeBookkeeper indicating "whether we performed a fast-forward or created a new (merge or single-parent) commit." It does not participate in any content synthesis; the input file content must be the merge result already prepared before the GUI.

public class
PullPlan

PullPlan contains: base / remote / localHead commits (for finalize) autoPlan: MergePlan of auto-applicable patches (no conflicts) conflicts: List<threewayentryconflict> that require user resolution