search

desktop / desktop

Focus on what matters instead of fighting with Git.
https://desktop.github.com
MIT License
19.61k stars 9.36k forks source link

update blank slate action to show "with rebase" if enabled #7101

Open tierninho opened 5 years ago

tierninho commented 5 years ago

The "next steps" suggestions do not have the rebasing changes incorporated yet, so the button are slightly different when comparing the pull state in the nav bar vs the highlighted next step.

Should say "Pull origin with rebase". Note: force-push applies here as well, etc... image

v1.6.5-beta2, mac.

TheOriginalSujay commented 5 years ago

Would this only be a change to how the button is presented, or does it also involve moving any data or performing any other functions differently?

shiftkey commented 5 years ago

Would this only be a change to how the button is presented, or does it also involve moving any data or performing any other functions differently?

@TheOriginalSujay this change would only be about ensuring the label is consistent. We defer to your Git config if you have pull.rebase set for the repository.

@billygriffin any objections to ensuring these labels are consistent?

billygriffin commented 5 years ago

@shiftkey Absolutely no objection. I'd be pretty upset as a user if the suggested next step didn't convey that information tbh. I do worry just a bit about the button having too many words and looking pretty odd as a result. If that's the case, a potential solution could be that we incorporate it into the title text instead. For example: "Pull 2 commits with rebase from the origin remote"

tierninho commented 5 years ago

Let's be sure to include force push status here as well.

image

shiftkey commented 5 years ago

Let's be sure to include force push status here as well.

We talked about this part of the flow over in #6990 and we decided to hide this menu item when "force push" is the next action.

shiftkey commented 5 years ago

Dropping this from the milestone because it's not a blocker on shipping the rebase flow, and can be picked up independent of the milestone.

shiftkey commented 5 years ago

Dropping in a screenshot of what it looks like with the Pull {remote} with rebase option because the change was pretty trivial in the end:

I think if we tweak the "Always available in the toolbar when there are remote changes ..." copy here it'll look fine, especially when we show Open in [editor] without trimming below.

tierninho commented 5 years ago

Steps to trigger pull with rebase: