org.jabref.logic.git.merge.execution.MergeBookkeeper
indicating "whether we performed a fast-forward or created a new (merge or single-parent) commit."
It does not participate in any content synthesis; the input file content must be the merge result already prepared before the GUI.
If "the local is strictly behind the remote and the file content is exactly the same as the remote" → fast-forward, no new commit is created;
Otherwise:
[local, remote]).Notes
Because the statuses UP_TO_DATE / AHEAD / CONFLICT / UNTRACKED are already filtered out before prepareMerge by GitStatusChecker, they will not enter finalizeMerge.
| Modifier and Type | Class and Description |
|---|---|
| public static enum |
| Modifier and Type | Field and Description |
|---|---|
| private final Optional | |
| private final BookkeepingResult. |
| Access | Constructor and Description |
|---|---|
| private |
| Modifier and Type | Method and Description |
|---|---|
| public static BookkeepingResult | |
| public Optional | |
| public static BookkeepingResult | |
| public boolean | |
| public boolean | |
| public boolean | |
| public boolean | |
| public boolean | |
| public BookkeepingResult. | |
| public static BookkeepingResult | |
| public static BookkeepingResult |
| commitId | back to summary |
|---|---|
| private final Optional<String> commitId | |
| kind | back to summary |
|---|---|
| private final BookkeepingResult. | |
| BookkeepingResult | back to summary |
|---|---|
| private BookkeepingResult(BookkeepingResult. | |
| ahead | back to summary |
|---|---|
| public static BookkeepingResult ahead() | |
| commitId | back to summary |
|---|---|
| public Optional | |
| fastForward | back to summary |
|---|---|
| public static BookkeepingResult fastForward() | |
| hasNewCommit | back to summary |
|---|---|
| public boolean hasNewCommit() | |
| isAhead | back to summary |
|---|---|
| public boolean isAhead() | |
| isFastForward | back to summary |
|---|---|
| public boolean isFastForward() | |
| isNoop | back to summary |
|---|---|
| public boolean isNoop() | |
| isUpToDate | back to summary |
|---|---|
| public boolean isUpToDate() | |
| kind | back to summary |
|---|---|
| public BookkeepingResult. | |
| newCommit | back to summary |
|---|---|
| public static BookkeepingResult newCommit(String commitId) | |
| upToDate | back to summary |
|---|---|
| public static BookkeepingResult upToDate() | |
| Modifier and Type | Field and Description |
|---|---|
| public static final BookkeepingResult. | |
| public static final BookkeepingResult. | |
| public static final BookkeepingResult. | |
| public static final BookkeepingResult. |
| Access | Constructor and Description |
|---|---|
| private |
| Modifier and Type | Method and Description |
|---|---|
| public static BookkeepingResult. | |
| public static BookkeepingResult. |
| FAST_FORWARD | back to summary |
|---|---|
| public static final BookkeepingResult. | |
| NEW_COMMIT | back to summary |
|---|---|
| public static final BookkeepingResult. | |
| NOOP_AHEAD | back to summary |
|---|---|
| public static final BookkeepingResult. | |
| NOOP_UP_TO_DATE | back to summary |
|---|---|
| public static final BookkeepingResult. | |
| Kind | back to summary |
|---|---|
| private Kind() | |
| valueOf | back to summary |
|---|---|
| public static BookkeepingResult. | |
| values | back to summary |
|---|---|
| public static BookkeepingResult. | |