Uploaded image for project: 'Bitbucket Data Center'
  1. Bitbucket Data Center
  2. BSERV-5000

Automatically merge hotfixes targeting my production branch to my develop branch as well

XMLWordPrintable

    • We collect Bitbucket feedback from various sources, and we evaluate what we've collected when planning our product roadmap. To understand how this piece of feedback will be reviewed, see our Implementation of New Features Policy.

      Currently In our company we have a project like your "Atlassian Markeptplace" Project. It has a Production branch ("master") and a Development Branch ("develop").
      This Workflow is a "simplier" git-flow Workflow and just uses master, develop, hotfixes and feature branches.
      If we create a feature branch it will simply merge from develop and will only be merged right into develop.
      But, if some things are broken we usually create a hotfix branch from master and wanted the hotfix branch automatically back to develop.

      Currently Stash only supports the automatic merge from release/ to other branches.

      In a talk from some of your guys you talk about the specific workflow here:
      http://www.youtube.com/watch?v=WX0hLfaKsWg&feature=youtu.be&t=55m17s

      Also I raised a QA at answers.atlassian.com:
      https://answers.atlassian.com/questions/315802/automatic-branch-merging-master-hotfix-to-develop

            [BSERV-5000] Automatically merge hotfixes targeting my production branch to my develop branch as well

            Sam Benskin added a comment -

            @S Alers, you're welcome. Yeah that does sound odd.

            Sam Benskin added a comment - @S Alers, you're welcome. Yeah that does sound odd.

            S Alers added a comment -

            @Sam thanks for the quick reply, I will test this. I found it weird that the functionality on the 'branching model' settings page only mentions release branches and doesn't mention hotfix branches

            S Alers added a comment - @Sam thanks for the quick reply, I will test this. I found it weird that the functionality on the 'branching model' settings page only mentions release branches and doesn't mention hotfix branches

            Sam Benskin added a comment -

            @S Alers, this functionality happens automatically if your branches are set up correctly in the repo admin. You don't specifically turn it on, it just happens when you merge a pull request. The diagram shows the ticket merging to master then to develop.

            Sam Benskin added a comment - @S Alers, this functionality happens automatically if your branches are set up correctly in the repo admin. You don't specifically turn it on, it just happens when you merge a pull request. The diagram shows the ticket merging to master then to develop.

            S Alers added a comment -

            I am currently running Stash v3.6.0 but I do not see this functionality in the branching model settings (or in any documentation about automatic merging). Where is this setting located?

            S Alers added a comment - I am currently running Stash v3.6.0 but I do not see this functionality in the branching model settings (or in any documentation about automatic merging). Where is this setting located?

            Sam Benskin added a comment -

            Thanks for the response Roger. I was asking more for a rough idea rather than an exact date to hold you to

            Sam Benskin added a comment - Thanks for the response Roger. I was asking more for a rough idea rather than an exact date to hold you to

            Roger Barnes (Inactive) added a comment -

            It's good to see this is in 3.3.0, but I was wondering when this is targeted for release?

            When 3.3.0 ships We do not publish release dates because they are always subject to change and we'd prefer not to set unreasonable expectations. Although our past release cadence is not a predictor of the future, it might give you some sense of the cycle we tend to aim for.

            Roger Barnes (Inactive) added a comment - It's good to see this is in 3.3.0, but I was wondering when this is targeted for release? When 3.3.0 ships We do not publish release dates because they are always subject to change and we'd prefer not to set unreasonable expectations. Although our past release cadence is not a predictor of the future, it might give you some sense of the cycle we tend to aim for.

            Sam Benskin added a comment -

            It's good to see this is in 3.3.0, but I was wondering when this is targeted for release?

            Sam Benskin added a comment - It's good to see this is in 3.3.0, but I was wondering when this is targeted for release?

            Sam Benskin added a comment -

            I'd also like to see this implemented.

            Currently we have to create two pull requests, one from the hotfix to master and one from the hotfix to develop, which doubles the effort

            Sam Benskin added a comment - I'd also like to see this implemented. Currently we have to create two pull requests, one from the hotfix to master and one from the hotfix to develop, which doubles the effort

              Unassigned Unassigned
              b38832839cc0 ChristianS
              Votes:
              2 Vote for this issue
              Watchers:
              9 Start watching this issue

                Created:
                Updated:
                Resolved: