Issue #13895 resolved
Ronald Chia
staff created an issue

I'm considering switching our workflow to squash our pull requests before merging, and if we do that, I'd like that to be the option selected by default for all our users - otherwise, people will forget to change it all the time and we'll have inconsistent pull request merges.

--BBS-49430

Official response

  • Alastair Wilkes staff

    Good news!

    The new Default merge strategy setting is now live in production. It can be found in a new Merge strategies tab in repository settings. Try it out today!

    If you find any issues with the new setting, open a new bug and assign it to me so as not to spam the 200 watchers of this issue.

    Thanks,
    Alastair
    Bitbucket PM

Comments (79)

  1. Marcus Schumann

    This is creating so much trouble for us.

    Developers forgetting to squash resulting in a very unclean git history. At the same time we don't want to restrict who can merge PR's so being able to choose a default strategy (or even select which strategies are available in the dropdown) would solve these problems for us.

  2. Safiq M

    Absolutely need this and it cant be that difficult to fix. Come on bitbucket team, we need you here !

    (Having a bunch of inconsistent merge strategies)

  3. Mukunda Gogoi

    It's a very low hanging fruit and can be done with some simple HTML and JS changes and will have a very good impact on customer satisfaction. Idk why is still not being picked up?

  4. Ondrej Rohon

    wow, this feature is really missing, I though that I'm blind that I cannot find it anywhere. Lack of this feature makes me rethink if I want to use bitbucket :/

  5. Ben Kutsch

    Please add, as this would be very useful. Plus 1 to all the other comments.

    We currently have this exact issue: "people will forget to change it all the time and we'll have inconsistent pull request merges."

  6. Bruno Hexsel

    Please add this, it would be good along with being able to suppress the meaningless "Merge PR XXXX" message" for people that would like their commit titles to have a meaning.

  7. Ronald Rey

    Hello guys, I'm the mainteiner for the chrome extension refined-bitbucket. My team and myself had been needing this as well so I decided to include it as a feature in the latest release v3.2.0.

    Feel free to check it out. If any of the other features feel invasive to you, you can disable all of them from the Options page.

    Let me know if you have feedback by opening an issue here.

  8. Sebastian Hofer

    We also need this feature. Just half an hour ago I had to fix a merge. People forget things, so they also will forget to change the merge strategy. It would be nice to have the possibility to set this different for branches.

  9. Ronald Rey

    @Amin Pakseresht, @Mukunda Gogoi, @Lewis Evans, @Joe Behymer, @Morten Frost, et. al.

    For anyone that didn't see my previous post on this thread, I implemented this feature myself in the Refined Bitbucket Chrome / Firefox extension that I maintain. I don't like to spam these threads but since apparently there's so many people suffering for it I couldn't help to mention it again, just in case.

    Check out the official repository for more information on the extension / add-on https://github.com/refined-bitbucket/refined-bitbucket

    33696537-147d0e90-dad9-11e7-9ada-a3726351639b.jpg

  10. Kyle Barry

    @Alastair Wilkes Sorry for hounding you... but any updates?

    This itty-bitty feature would go a long way to keeping git history clean.

    I've soapboxed endlessly about git squash, but it is not the default workflow for most devs.

    Just... painful.

  11. Kevin Rejko

    @Atlassian Bitbucket Team great work so far. I love that we have the option to squash at all, even if it's not the default.

    However, I am one of the people that does constantly have to go back un-merging and re-merging pull requests when other developers on my team forget to update the dropdown box.

    I see that this feature request is among the top 20 highest voted open features and the request was created over a year now. Can you provide any insight into when we could expect progress towards this?

    In terms of competitive advantage, this is a feature GitHub has offered for some time now. I would really appreciate it if you could find the time to prioritize this ticket. Thanks!

  12. Alastair Wilkes staff

    Good news!

    The new Default merge strategy setting is now live in production. It can be found in a new Merge strategies tab in repository settings. Try it out today!

    If you find any issues with the new setting, open a new bug and assign it to me so as not to spam the 200 watchers of this issue.

    Thanks,
    Alastair
    Bitbucket PM

  13. Russell Harrison

    Seriously!? You only give me git merge --no-ff, which no one wants ever, or squash merges? WFT is wrong with people. I want less merge bubbles, NOT forced merge bubbles and I want the complete history. What's wrong with attempting fast forward merges and then falling back to merge commits only if a fast forward fails? This issue is still open and has in no way been fixed. I thought we would get the full range of default merge choices stash had.

    Its time to go to github which does the right thing by default.

  14. Alastair Wilkes staff

    @Russell Harrison - This issue only concerns providing a repo setting to configure the default (you’ll notice it was opened right after we released squash merges). We’ll handle adding other strategies to the list in separate tickets - like #6106 for fast-forward merges, which we’re also working right now!

  15. Log in to comment