Process MergeOutput
to handle successful, failed, and halted merges
#1059
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The results of merging can have varied outcomes that need to be properly handled, including:
fatal
anderror
messages indicating that the merge failed to startTo properly model these scenarios, this PR introduces
processMergeOutput
function for evaluating the raw output from an executed merge in order to discernstatus: Passing
andstatus: Failing
as well as reasons for these results.This PR resolves #978.
Changes:
This PR makes the following changes:
TimelineButtons
component toMergeButtons
to reflect usage being dependent on merginggit-rev-list
command for listing commit objects in reverse chronological orderprocessMergeOutput
function for populatingstatus
,alreadyMerged
,fastForward
,output
,mergeCommit
,mergeStrategy
, andconflicts
fields from a mergeprocessMergeOutput
MergeStatus
component for displayingsuccess
,warning
, anderror
alert messages based on merge resultsReact Developer Tools
hook to Electron extensions