Top Constructors Methods

org.jabref.logic.git.merge.execution

public Class GitMergeApplier

Class Inheritance

extends Object

java.lang.Object
org.jabref.logic.git.merge.execution.GitMergeApplier

Imports

java.util.List, org.jabref.logic.git.model.MergePlan, org.jabref.model.database.BibDatabaseContext, org.jabref.model.entry.BibEntry

Constructor Summary

Access	Constructor and Description
public	GitMergeApplier()

Method Summary

Modifier and Type	Method and Description
public static void	applyAutoPlan(BibDatabaseContext bibDatabaseContext, MergePlan plan) Apply (remote - base) patches safely in the current BibDatabaseContext, plus safe new/deleted entries.
public static void	applyResolved(BibDatabaseContext bibDatabaseContext, List<BibEntry> resolved) Apply user-resolved entries into the current BibDatabaseContext: replace or insert by citation key.

Inherited from java.lang.Object:: clone equals finalize getClass hashCode notify notifyAll toString wait wait wait

Constructor Detail

GitMergeApplier	back to summary
public GitMergeApplier()

Method Detail

applyAutoPlan	back to summary
public static void applyAutoPlan(BibDatabaseContext bibDatabaseContext, MergePlan plan) Apply (remote - base) patches safely in the current BibDatabaseContext, plus safe new/deleted entries.

applyResolved	back to summary
public static void applyResolved(BibDatabaseContext bibDatabaseContext, List<BibEntry> resolved) Apply user-resolved entries into the current BibDatabaseContext: replace or insert by citation key. (Aligned with `MergeEntriesAction`’s “edit the in-memory library first” philosophy.)