fork-dev / TrackerWin

Bug and issue tracker for Fork for Windows
450 stars 10 forks source link

Adjust text in Pull dialog to match intention (merge, rebase) #2197

Open brokenthorn opened 2 months ago

brokenthorn commented 2 months ago

I think the Pull dialog does not make sense currently, when "Rebase instead of merge" is selected. For example, the selected branch is not the branch that is merged into the "into" (current) branch. Rather it's the "onto" branch that the current branch is rebased onto.

Here are the areas I think need attention: image (consider deleting the text in the red square brackets if no better formulation can be found, or changing this text when rebase is selected to not include this part)

Also maybe it's worth changing the Title from Pull to Rebase, and the order of the fields when rebase is checked to be, from top to bottom:

Rebase Rebase you local branch onto remote branches

because, notice that the current original UI when read from top to bottom "says": Pull Remote Branch Into.

Here a crude MSPaint mockup: image