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

Pull request merge strategy #712

Closed
rudineirk opened this issue Jan 20, 2017 · 2 comments · Fixed by #3188
Closed

Pull request merge strategy #712

rudineirk opened this issue Jan 20, 2017 · 2 comments · Fixed by #3188
Labels
type/feature Completely new functionality. Can only be merged if feature freeze is not active.
Milestone

Comments

@rudineirk
Copy link

rudineirk commented Jan 20, 2017

A nice feature to have would be squash and rebasing options to accept a pull request, like github does.

merge

I think the UI for the merge options could be something like github, as it's very simple to select a merge option.

Github also has a project configuration UI to enable/disable the pull request merge modes on a per project basis. Not every project mantainers would like to leave all options enabled, so this could be necessary.
merge_config


Want to back this issue? Post a bounty on it! We accept bounties via Bountysource.

@lunny lunny added the type/feature Completely new functionality. Can only be merged if feature freeze is not active. label Jan 21, 2017
@lunny lunny added this to the 1.2.0 milestone Jan 21, 2017
@lunny lunny modified the milestones: 1.3.0, 1.2.0 Apr 6, 2017
@priyadarshan
Copy link

It would be so useful to be able to choose a merge strategy. If it helps, this is how GitLab does it, and this is how BitBucket does it.

@bkcsoft
Copy link
Member

bkcsoft commented Apr 19, 2017

+1 on merge strategies, very helpful when I (as a contributor) know I have or will have lots of commits and it should be squashed.

@rudineirk rudineirk changed the title Pull request merge modes Pull request merge strategy Apr 19, 2017
@lunny lunny mentioned this issue Sep 22, 2017
20 tasks
@lunny lunny modified the milestones: 1.3.0, 1.x.x Oct 10, 2017
@lunny lunny modified the milestones: 1.x.x, 1.4.0 Jan 6, 2018
@go-gitea go-gitea locked and limited conversation to collaborators Nov 23, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
type/feature Completely new functionality. Can only be merged if feature freeze is not active.
Projects
None yet
4 participants