Process `MergeOutput` to handle successful, failed, and halted merges#1059

Merged

nelsonni merged 9 commits intomainfrom fix/merge-status

Dec 16, 2022

+319-64

Commits on Dec 15, 2022

mergeBranch updated to handle fast-forward, rebase, and several types of failing merges
nelsonni
committed

Commits on Dec 16, 2022

TimelineButtons renamed to MergeButtons to reflect usage
nelsonni
committed
Added git-rev-list command to allow calculating commits between branches prior to merging
nelsonni
committed
processMergeOutput added to handle output of mergeBranch in consistent manner; tests included
nelsonni
committed
New MergeStatus component to indicate success, warning, and error results from mergeBranch
nelsonni
committed
Cleanup MergeDialog component to use MergeStatus and updated mergeBranch results
nelsonni
committed
Remove unnecessary imports
nelsonni
committed
Add REACT_DEVELOPER_TOOLS to Electron extensions
nelsonni
committed
Fix conflict paths in git-merge test specs
nelsonni
committed