Preference regarding the merging/rebasing is often a part of an overarching development policy. Therefore instead of a checkbox with "Use rebase instead of merge" SourceGit should approach this in the standard way which should be communicated via a drop-down button with 3 options:
- [Default] - would choose the first of the following defined: (i) git's repository level preference; (ii) git's global preference; (iii)
SourceGit's preference - that could be defined in the application settings and would only be used if the first two are not defined;
- [Merge]
- [Rebase]
Preference regarding the merging/rebasing is often a part of an overarching development policy. Therefore instead of a checkbox with "Use rebase instead of merge"
SourceGitshould approach this in the standard way which should be communicated via a drop-down button with 3 options:SourceGit's preference - that could be defined in the application settings and would only be used if the first two are not defined;