display merge conflict hint before doing the merge#5495
Conversation
|
The two screens are wired up and functional. I haven't bothered with getting the elements positioned like the mockups yet.
I'd love some help polishing the layout @desktop/design as the poor conflict warning looks like it's currently balancing the button (shout out to @donokuda for his endorsement of my mad skillz). But I'd also like to turn the message into a shared component for the logic - it's currently replicated and a slightly different
|
|
@desktop/design do y'all have any bandwidth to help polish the current screen here for our internal demo tomorrow? We've got a contingency plan otherwise, but it's be nice to Do It Live™ with the live app looking more like the mocks. |
|
@shiftkey I gotchu 👈😄👈 |
9f38077 to
c3f06c7
Compare
f6b6959 to
b1f5f30
Compare
…-tab-outofambit MergeCallToActionWithConflicts display logic refactor
|
🍎 |
ensure the old layout is fine for users until they see the new merge hint
add analytics for how user leverages merge hint to merge
|
@outofambit my bad on the timing of my feedback. Turns out my review went unsubmitted yesterday (I'm entirely at fault here, I didn't push the big green button!) |
app/src/lib/stores/app-store.ts
Outdated
| this.emitUpdate() | ||
| }) | ||
|
|
||
| const cleanup = () => (this.currentMergeTreePromise = null) |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
🌵 🌵 🌵 Builds upon #5493, go review that first 🌵 🌵 🌵This PR adds the UX for #4588 in two places, the Compare tab and the Merge Dialog. Both of these areas are decision points when the user decides to merge in some other branch into their current branch, and we want to help guide them.
I'm working from these mocks in this comment #4588 (comment) but these are likely to change:
masteronce add parseMergeResult functionality and tests to detect merge conflicts #5493 is mergedmergeTreework inAppStore