Verified Owner
Top Description Constructors Methods
org.jabref.logic.git.conflicts

public Class CliGitConflictResolverStrategy

extends Object
implements GitConflictResolverStrategy
Class Inheritance
All Implemented Interfaces
org.jabref.logic.git.conflicts.GitConflictResolverStrategy
Imports
java.util.List, org.jabref.model.entry.BibEntry
No-op implementation of GitConflictResolverStrategy for CLI use.

Todo

Implement CLI conflict resolution or integrate external merge tool.

Constructor Summary

AccessConstructor and Description
public
CliGitConflictResolverStrategy()

Method Summary

Modifier and TypeMethod and Description
public List<BibEntry>
resolveConflicts(List<ThreeWayEntryConflict> conflicts)

Implements org.jabref.logic.git.conflicts.GitConflictResolverStrategy.resolveConflicts.

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

Inherited from java.lang.Object:
cloneequalsfinalizegetClasshashCodenotifynotifyAlltoStringwaitwaitwait

Constructor Detail

CliGitConflictResolverStrategyback to summary
public CliGitConflictResolverStrategy()

Method Detail

resolveConflictsback to summary
public List<BibEntry> resolveConflicts(List<ThreeWayEntryConflict> conflicts)

Implements org.jabref.logic.git.conflicts.GitConflictResolverStrategy.resolveConflicts.

Doc from org.jabref.logic.git.conflicts.GitConflictResolverStrategy.resolveConflicts.

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

Annotations
@Override