Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 9 commits into from
Dec 16, 2022

Conversation

nelsonni
Copy link
Member

The results of merging can have varied outcomes that need to be properly handled, including:

To properly model these scenarios, this PR introduces processMergeOutput function for evaluating the raw output from an executed merge in order to discern status: Passing and status: Failing as well as reasons for these results.

This PR resolves #978.

Changes:

This PR makes the following changes:

  • Rename TimelineButtons component to MergeButtons to reflect usage being dependent on merging
  • Add git-rev-list command for listing commit objects in reverse chronological order
  • Add processMergeOutput function for populating status, alreadyMerged, fastForward, output, mergeCommit, mergeStrategy, and conflicts fields from a merge
  • Add test specs for processMergeOutput
  • Add MergeStatus component for displaying success, warning, and error alert messages based on merge results
  • Add React Developer Tools hook to Electron extensions

@nelsonni nelsonni added bug Bug reports or bug fixes feature Feature requests or improvements labels Dec 16, 2022
@nelsonni nelsonni self-assigned this Dec 16, 2022
@nelsonni nelsonni merged commit 70de58a into main Dec 16, 2022
@nelsonni nelsonni deleted the fix/merge-status branch December 16, 2022 18:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Bug reports or bug fixes feature Feature requests or improvements
Projects
None yet
Development

Successfully merging this pull request may close these issues.

error: Your local changes to the following files would be overwritten by merge
1 participant