Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Respect merge strategy when updating a branch on the UI #2576

Open
alwibrm opened this issue Oct 8, 2020 · 1 comment
Open

Respect merge strategy when updating a branch on the UI #2576

alwibrm opened this issue Oct 8, 2020 · 1 comment

Comments

@alwibrm
Copy link

alwibrm commented Oct 8, 2020

Issue

Impacted version: 4.34.0

Deployment mode: standalone app

Problem description:
When opening a Pull Request it might happen, that the branch you want to merge from gets out of date. Therefore GitBucket offers the comfortable function to update the branch via Web UI. The merge strategy for this function seems to be "merge commit" always, no matter what you have defined as default merge strategy for the repository.

Since development teams normally commit themselves on a common mode of git usage it would be consistent when the merge strategy is also applied to the "update branch" function on the Web UI.

@Stemann311
Copy link

I would prefer to even have a completely detached configuration for this button, e.g. "update strategy". In our team, we use rebase to update our feature branches, but merge to get the feature branch into develop.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

No branches or pull requests

3 participants