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:
(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
Rebase: feature/64678
Onto: origin
Branch: origin/feature/646789
because, notice that the current original UI when read from top to bottom "says": Pull Remote Branch Into.
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:
(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](https://github.com/fork-dev/TrackerWin/assets/2119004/b7792292-efa8-4608-9dae-a0b61e94c176)