Open tierninho opened 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?
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?
@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"
Let's be sure to include force push
status here as well.
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.
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.
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.
Steps to trigger pull with rebase:
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](https://user-images.githubusercontent.com/14828183/54457191-d7f35300-4704-11e9-82b5-24f4531f5441.png)
v1.6.5-beta2, mac.