Details

    • Type: Improvement Improvement
    • Status: Resolved (View Workflow)
    • Priority: Major Major
    • Resolution: Fixed
    • Affects Version/s: 1.2.9.1
    • Fix Version/s: 1.5.0
    • Component/s: Git
    • Labels:
      None
    • Last commented by user?:
      true

      Description

      Currently we use git flow (see https://github.com/nvie/gitflow or http://nvie.com/posts/a-successful-git-branching-model/).

      Unfortunately currently we have to use the command line for this purpose.

      Since git flow is really a great tool, support in source tree would be really cool.

        Activity

        Hide
        Doug added a comment -

        git is still a fairly scary tool for a lot of people, just because of it's open ended nature. Getting my designers and support people to a) use git, and b) not mess things up, is still a bit tricky. GUI tools are especially useful for people in this category, who are likely to not be command line masters. Having a constraint enforcement model built in would make SourceTree even more appealing by making it the go-to choice for people looking for some guidance.

        It would be great if these types of enforcements could be programmatically described as a set of rules which the workflow follows. git-flow would then just be one possible instantiation of a set of rules, and organizations would be free to tailor to their needs.

        Show
        Doug added a comment - git is still a fairly scary tool for a lot of people, just because of it's open ended nature. Getting my designers and support people to a) use git, and b) not mess things up, is still a bit tricky. GUI tools are especially useful for people in this category, who are likely to not be command line masters. Having a constraint enforcement model built in would make SourceTree even more appealing by making it the go-to choice for people looking for some guidance. It would be great if these types of enforcements could be programmatically described as a set of rules which the workflow follows. git-flow would then just be one possible instantiation of a set of rules, and organizations would be free to tailor to their needs.
        Hide
        Steve Streeting [Atlassian] added a comment -

        @Doug: Good point, although I personally think git-flow is a bad choice for that, since it encourages over-complexity in my view. Also given that designers work with binary files a lot, the very last thing you want to do is promote an overly branchy model because merging is more likely to bite you further down the line (not being branchy doesn't avoid it, but at least you find out faster, saving lost work).

        It's another reason why I'd really like to provide a more holistic approach to this, with git-flow being just one instance. Which is also one reason why it's not done yet.

        Show
        Steve Streeting [Atlassian] added a comment - @Doug: Good point, although I personally think git-flow is a bad choice for that, since it encourages over-complexity in my view. Also given that designers work with binary files a lot, the very last thing you want to do is promote an overly branchy model because merging is more likely to bite you further down the line (not being branchy doesn't avoid it, but at least you find out faster, saving lost work). It's another reason why I'd really like to provide a more holistic approach to this, with git-flow being just one instance. Which is also one reason why it's not done yet.
        Hide
        Chris Bandy added a comment -

        I agree with @sstreeting that workflows are the general case to solve here.

        Custom actions are almost a viable workaround for using git-flow from the GUI, except for the inability to prompt the user for input, e.g. the name of a feature branch.

        If this capability were added, I can imagine a "Workflow" menu that is configured and behaves just like the existing Custom Actions feature.

        Show
        Chris Bandy added a comment - I agree with @sstreeting that workflows are the general case to solve here. Custom actions are almost a viable workaround for using git-flow from the GUI, except for the inability to prompt the user for input, e.g. the name of a feature branch. If this capability were added, I can imagine a "Workflow" menu that is configured and behaves just like the existing Custom Actions feature.
        Hide
        Steve Streeting [Atlassian] added a comment -

        Having spent some time with both git flow and hg flow, I can definitely see their utility now, particularly around consistency and ease of training. I've actually changed my opinion on the implementation detail; I think their standardisation and defaults is their strength, and much more useful than the open-ended, more generic workflow system that I had thought would be a better approach before I really started using them in earnest.

        Therefore I've implemented explicit support for both git-flow and hg-flow and their usual concepts (features, releases, hotfixes) in 1.5, with some hopefully useful preview areas to improve visibility of what's going on, and contextual defaults for the next most likely action (e.g. finishing a feature if you're on a feature branch) Example: https://skitch.com/sjstreeting/edf8d/sourcetree-gitflow

        Show
        Steve Streeting [Atlassian] added a comment - Having spent some time with both git flow and hg flow, I can definitely see their utility now, particularly around consistency and ease of training. I've actually changed my opinion on the implementation detail; I think their standardisation and defaults is their strength, and much more useful than the open-ended, more generic workflow system that I had thought would be a better approach before I really started using them in earnest. Therefore I've implemented explicit support for both git-flow and hg-flow and their usual concepts (features, releases, hotfixes) in 1.5, with some hopefully useful preview areas to improve visibility of what's going on, and contextual defaults for the next most likely action (e.g. finishing a feature if you're on a feature branch) Example: https://skitch.com/sjstreeting/edf8d/sourcetree-gitflow
        Hide
        Dieter Rehbein added a comment -

        great, thanks a lot!

        Show
        Dieter Rehbein added a comment - great, thanks a lot!

          People

          • Votes:
            5 Vote for this issue
            Watchers:
            5 Start watching this issue

            Dates

            • Created:
              Updated:
              Resolved:
              Last commented:
              1 year, 42 weeks, 1 day ago