Package | Description |
---|---|
org.eclipse.jgit.notes |
Git notes processing (for commits, etc).
|
Modifier and Type | Method | Description |
---|---|---|
Note |
NoteMerger.merge(Note base,
Note ours,
Note their,
ObjectReader reader,
ObjectInserter inserter) |
Merges the conflicting note changes.
|
Copyright © 2018. All rights reserved.