tidy up merge status model and introduce rebase status model#7135
tidy up merge status model and introduce rebase status model#7135outofambit merged 7 commits intodevelopmentfrom
Conversation
20c0077 to
29b8a39
Compare
29b8a39 to
0e410ae
Compare
outofambit
left a comment
There was a problem hiding this comment.
two (non-blocking) small things, but otherwise looks good. I like this level of abstraction!
| @@ -0,0 +1,14 @@ | |||
| /** | |||
| * A state representing the app computing whether a planned action will require | |||
There was a problem hiding this comment.
I think I know the intent behind this enum by reading this but i'm not sure. could we add a couple examples to this comment of what "a planned action" is? (merges, rebases, etc)
There was a problem hiding this comment.
Let me kick this down the road to the next PR - the rebase case is similar to merge but might help with clarifying these docs.
|
Just pushed one last commit because I overlooked one |
|
I'm going to go ahead of another 24 hour waiting period and merge this since the changes since I approved yesterday are super minor. |
Overview
Groundwork to complete #6960 and #6959
Description
This PR addresses two pieces of tech debt that I noticed while refreshing my memory on how we computed the "merge status" when comparing branches (either in the History sidebar or in the Merge Branch dialog).
MergeResultKindwhich looks very similar to what I need for the rebase statusComputedActionKindand now lives in it's own moduleMergeResultStatusin app state andMergeResultin the models folderMergeResultso that we have a common model for this "merge status"I also added in the
RebasePreviewResultstatus which will be used in subsequent PRs to represent the "success"/"conflicts" rebase preview state at the start of the rebase flow.Release notes
Notes: no-notes