@donokuda I'm looking into some corner cases about the flow itself after testing this more, but I think the "Merge into Current branch" dialog didn't get the same love with the indicator:

@donokuda I'm juggling keeping downstream PRs #5493 and #5495 focused on their specific changes, so don't worry about those conflicts you're seeing - once you're happy with the UX I'll rebase it so that it's easy to review just what's changed here.

@desktop/design I think this is pretty close - I did some tidy up of the Merge dialog and it's now looking like the Compare tab:

The SCSS can probably be better organized - maybe even unified - but I'll leave that up to y'all to figure out what's important here.

😍There's a few spacing inconsistencies that I can jump in and clean up. Overall, thx @shiftkey!

The SCSS can probably be better organized - maybe even unified - but I'll leave that up to y'all to
figure out what's important here.

👍This makes sense especially if the markup in both places are similar. I'll also take a quick look at that.

Dropping in some fresh screenshots now that the commits are reorganized:

@desktop/design if you've got a local branch and want to keep working on this you'll need to reset it to the remote:

$ git fetch --all
$ git checkout polish-merge-status
$ git reset origin/polish-merge-status --hard

I got one more small detail to push, and then I'll comment with some sort of emoji to indicate that my part is also ready to review.

Was taking a look at this feature in xXdark modeXx and saw that the text treatment between the merge dialog and the compare panel could be more consistent.

Specifically, the emphasized words are white while the rest of the sentence are a little gray so that the more important information stands out.

Before (👀at the panel to the left)

After

🥝My part is ready for review now and open to any feedback, especially around CSS stuff like

@donokuda I added the UI work for "unrelated histories" in 264e990 and I had to merge that in here to address a conflict, but I'll leave it up to you whether you want to restyle these or punt to a follow-up PR:

To test, use a repository that contains a gh-pages branch (like https://github.com/prettier/prettier) and choose that as the branch to merge into your current branch.

🍎

@donokuda I added the UI work for "unrelated histories" in 264e990 and I had to merge that in here to address a conflict, but I'll leave it up to you whether you want to restyle these or punt to a follow-up PR

Famous last words: "This seems simple enough to do."

I'll time box this to lunchtime and respond on whether we should punt for now given that this is more of an edge case.

@donokuda thanks for the update. I might even be able to get to it as part of #5495 tomorrow if you don't have a chance today.

🥗

xXDark ModeXx

Merge dialog	Compare tab

Light mode

Merge dialog	Compare tab

EDIT: /cc @outofambit since you reviewed my codes 🔍 👀

woo! this is looking great! can we get a gif of the less jarring transition between pending and end result now? :D (will also be helpful for QA and maybe help docs)

woo! this is looking great! can we get a gif of the less jarring transition between pending and end result now? :D (will also be helpful for QA and maybe help docs)

@nerdneha Would this work?

Would it be better flipped vertically (i.e. the message, then the icon, then the button? That way, the button’s position wouldn’t change so the user would be able to click it even if the status-getting finishes while they’re hovering.

We've got two approvals here and I've got a couple of tasks left in #5495 to tackle, so I'm going to merge this in so I can stop juggling multiple PRs.

@j-f1 I'll let @desktop/design weigh in on that suggestion as this PR is about polishing the current layout - I have no strong feels either way.