-
Suggestion
-
Resolution: Done
The pull requests are a nice feature, but not only do we still need to delete branches manually (see issue STASH-2753), it is also not possible to squash the new commit into the target branch.
We would like to have a clean history that doesn't show any parellel commits in our main development and master branches.
It seems that this is relatively easy to implement, since it is a new button and a few extra git commandline calls. But that is from a user point of view.
- has a derivative of
-
BSERV-3093 Repository setting for merge strategy when merging a pull request
- Closed
- is duplicated by
-
BSERV-3350 Ability to squash commits from UI
- Closed
- is related to
-
BSERV-2753 Option to delete a branch after pull request merge
- Closed
-
BSERV-2873 As a Stash user, I want to rebase prior to merging a Pull Request
- Closed
- relates to
-
BSERV-2857 Pull Request should not force --no-ff flag
- Closed
-
BSERV-6913 Change "declined" to a friendlier verb or add a new pull request status.
- Closed
- mentioned in
-
Page Loading...
-
Page Loading...
-
Page Loading...
-
Page Loading...
-
Page Loading...
-
Page Loading...
I know this ticket is closed now (thanks to the "squash merge" ability of Bitbucket 4.9), but I thought people might be interested in a way to squash the source branch without actually touching the target branch. The paid Bit-Booster add-on puts a Squash button on the pull-request screen and let's you do exactly that. The result is pushed to the source branch via "git push --force-with-lease", and it respects all branch permissions and push hooks.
It also let's you edit the commit message of the final commit, and if the squashed commits involved more than one author, it let's you select the author (defaults to author of oldest commit).
Here's a screenshot of the Squash button: