use shared components for merge and rebase conflicts#7030
use shared components for merge and rebase conflicts#7030iAmWillShepherd merged 8 commits intodevelopmentfrom
Conversation
8e0f14d to
6798c57
Compare
|
I added ec327ff to this branch because rebase terminology uses the opposite names for "ours" and "theirs" while doing a rebase. To illustrate before the change:
With that last commit, the change is correctly associated:
You'll also note that sometimes we lack the context for listing both branches when dealing with rebase conflicts - once Git kicks off the rebase it uses the base commit ID rather than ref, so in this case (with an in-progress rebase) we are unable to resolve the base branch to show in this context menu. Hopefully once we can get the full rebase flow baked we'll be able to track the branch name when the rebase started and flow that through to the other dialogs. |
| openThisRepositoryInShell: () => void | ||
| ): JSX.Element { | ||
| return ( | ||
| <div> |
There was a problem hiding this comment.
Can we return a simple fragment (<>all the stuff</>) here since this div node doesn't have an Id or class.
There was a problem hiding this comment.
I want to leave this as-is because this is how it was written for use in Merge Conflicts, and cc @outofambit for feels when she returns next week.
Tested the above scenarios and results were 💎as well. |
|
Merge early since the last changes were update to type signature and improved comments. |
Overview
Closes #6904
Description
This PR addresses some cleanup post
1.6.3that brings together the merge conflicts and rebase conflicts components, given how much overlap they have:app/src/ui/lib/conflicts/module to contain shared functionalityrenderUnmergedFileinto this directoryRebaseConflictsDialogin favour of using shared componentsMergeConflictsDialogto use the render functionsTesting:
Release notes
Notes: