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

          Form Name

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

            Katherine Yabut made changes -
            Workflow Original: JAC Suggestion Workflow [ 3396161 ] New: JAC Suggestion Workflow 3 [ 3619708 ]
            Status Original: RESOLVED [ 5 ] New: Closed [ 6 ]
            Monique Khairuliana (Inactive) made changes -
            Workflow Original: BSERV Suggestions Workflow [ 2686975 ] New: JAC Suggestion Workflow [ 3396161 ]
            Owen made changes -
            Workflow Original: Stash Workflow [ 700997 ] New: BSERV Suggestions Workflow [ 2686975 ]
            Status Original: Closed [ 6 ] New: Resolved [ 5 ]
            jhinch (Atlassian) made changes -
            Link New: This issue causes STASH-5246 [ STASH-5246 ]
            jhinch (Atlassian) made changes -
            Link Original: This issue relates to STASH-5246 [ STASH-5246 ]
            Deric Lee (Inactive) made changes -
            Link New: This issue relates to STASH-5246 [ STASH-5246 ]
            Justus Pendleton (Inactive) made changes -
            Assignee Original: jhinch (Atlassian) [ jhinch ]
            Issue Type Original: New Feature [ 2 ] New: Suggestion [ 10000 ]
            jhinch (Atlassian) made changes -
            Fix Version/s New: 3.3.0 [ 44801 ]
            Resolution New: Fixed [ 1 ]
            Status Original: In Progress [ 3 ] New: Closed [ 6 ]
            jhinch (Atlassian) made changes -
            Assignee New: jhinch (Atlassian) [ jhinch ]
            jhinch (Atlassian) made changes -
            Issue Type Original: Suggestion [ 10000 ] New: New Feature [ 2 ]

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

                Created:
                Updated:
                Resolved: