org.jabref.logic.git.conflicts

public Interface GitConflictResolverStrategy

Known Direct Implementers: org.jabref.logic.git.conflicts.CliGitConflictResolverStrategy
Imports: java.util.List, org.jabref.model.entry.BibEntry

Strategy interface for resolving semantic entry-level conflicts during Git merges.

Implementations decide how to resolve ThreeWayEntryConflicts, such as via GUI or CLI.

Method Summary

Modifier and Type	Method and Description
public List<BibEntry>	Returns: the modified BibDatabaseContext containing resolved entries, or empty if user canceled merge or CLI refuses to merge. resolveConflicts(List<ThreeWayEntryConflict> the list of detected three-way entry conflicts conflicts) Resolves all given entry-level semantic conflicts, and produces a new, resolved remote state.

resolveConflicts	back to summary
public List<BibEntry> resolveConflicts(List<ThreeWayEntryConflict> conflicts) Resolves all given entry-level semantic conflicts, and produces a new, resolved remote state. Parameters conflicts:List<ThreeWayEntryConflict> the list of detected three-way entry conflicts Returns:List<BibEntry> the modified BibDatabaseContext containing resolved entries, or empty if user canceled merge or CLI refuses to merge.

resolveConflicts

public List<BibEntry> resolveConflicts(List<ThreeWayEntryConflict> conflicts)

Resolves all given entry-level semantic conflicts, and produces a new, resolved remote state.

Parameters

conflicts:List<ThreeWayEntryConflict>: the list of detected three-way entry conflicts

the modified BibDatabaseContext containing resolved entries, or empty if user canceled merge or CLI refuses to merge.