Package | Description |
---|---|
org.eclipse.jgit.merge |
Content and commit history merge algorithms.
|
Modifier and Type | Method | Description |
---|---|---|
protected boolean |
ResolveMerger.processEntry(CanonicalTreeParser base,
CanonicalTreeParser ours,
CanonicalTreeParser theirs,
DirCacheBuildIterator index,
WorkingTreeIterator work,
boolean ignoreConflicts) |
Processes one path and tries to merge.
|
Copyright © 2018. All rights reserved.