Bug 242731 - Integrate git flow into netbeans.
Integrate git flow into netbeans.
Status: NEW
Product: versioncontrol
Classification: Unclassified
Component: Git
8.0
All All
: P3 with 13 votes (vote)
: TBD
Assigned To: Ondrej Vrabec
issues@versioncontrol
:
Depends on:
Blocks:
  Show dependency treegraph
 
Reported: 2014-03-10 10:28 UTC by ChrisLE
Modified: 2017-06-02 13:10 UTC (History)
6 users (show)

See Also:
Issue Type: ENHANCEMENT
:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description ChrisLE 2014-03-10 10:28:19 UTC
Because of a successful git branching model (http://nvie.com/posts/a-successful-git-branching-model/) it would be great if we can have support for git flow. But not this: https://github.com/nvie/gitflow (This is obsoleted), this is better: http://braumeister.org/formula/git-flow-avh (https://github.com/petervanderdoes/gitflow).


Regards

Chris
Comment 1 marinig 2014-06-21 07:56:06 UTC
It Would be great to manage git flow directly in NetBeans!
When do you plan to work on this? I see that the target release version is still TBD...
Please let us know! 
Thanks
Comment 2 Ondrej Vrabec 2014-06-21 11:37:31 UTC
(In reply to marinig from comment #1)
> It Would be great to manage git flow directly in NetBeans!
> When do you plan to work on this?
Me? Probably never on git flow. git-flow is a git cli extension and because we do not use CLI but a Java implementation (JGit) we cannot use git-flow commands. However i expect git flow implementation to be just a set of standard git commands merged together into a higher-level commands (finish = checkout+merge+branch_delete) i guess. So NetBeans could probably do the same, choose several git-flow commands and implement them on its own.
Any volunteer for this?
Comment 3 Ondrej Vrabec 2014-06-21 12:29:07 UTC
(In reply to Ondrej Vrabec from comment #2)
> However i expect git flow implementation to be just a set of
> standard git commands merged together into a higher-level commands (finish =
> checkout+merge+branch_delete) i guess. So NetBeans could probably do the
> same, choose several git-flow commands and implement them on its own.
... actually group the git commands mentioned in http://nvie.com/posts/a-successful-git-branching-model/ into one.
Comment 4 Ondrej Vrabec 2014-11-05 07:13:09 UTC
Can anyone please describe what is expected from the NB git support? Git flow does not bring anything extra new besides the methodology. Which you can of course achieve even now with the Git support.
So basically an equivalent for "Create a new feature branch", you simply do Git -> Branch -> Create Branch and enter just "features/MY_FEATURE" as its name and select "Checkout Branch" option. Similarly to finish a feature branch you do "Merge" and then "Delete" the branch.
As i see it this is just about making the process smoother and simply only grouping some commands together. Or not?
Comment 5 hermitzee 2014-11-22 04:15:56 UTC
(In reply to Ondrej Vrabec from comment #4)
> Can anyone please describe what is expected from the NB git support? Git
> flow does not bring anything extra new besides the methodology. Which you
> can of course achieve even now with the Git support.
> So basically an equivalent for "Create a new feature branch", you simply do
> Git -> Branch -> Create Branch and enter just "features/MY_FEATURE" as its
> name and select "Checkout Branch" option. Similarly to finish a feature
> branch you do "Merge" and then "Delete" the branch.
> As i see it this is just about making the process smoother and simply only
> grouping some commands together. Or not?

Perhaps a faster way to do things such as branch, a bit like the git flow commands (https://github.com/nvie/gitflow) but intergrated into the content menu.
Example of what I mean. 

1) Add a feature branch
Right click the project -> git -> new feature (which auto adds the prefix "feature/") and branches from develop (a tickbox to pull latest develop would be handy)
- Same as #git flow feature start refs_ticketnumber

2) To finish a feature branch (current branch is a feature branch)
Right click the project -> git -> finish feature
- Same as #git flow feature finish
Comment 6 danny_b 2014-12-09 14:53:40 UTC
This might give a huge help:
https://bitbucket.org/atlassian/jgit-flow
(Licensed under Apache 2.0)
Comment 7 ChrisLE 2015-09-15 14:12:30 UTC
Here is the workflow: http://danielkummer.github.io/git-flow-cheatsheet/
Comment 8 Two 2016-01-08 13:47:53 UTC
Working with GIT like this is de facto standard, and I would really love to see this simplified in Netbeans.
Comment 9 wilmar 2016-03-04 01:57:50 UTC
Some IDE's support this feature ... http://eclipsesource.com/blogs/2015/06/22/git-flow-top-eclipse-mars-feature-3/
Comment 10 wilmar 2016-03-04 01:58:39 UTC
Some IDE's support this feature ... http://eclipsesource.com/blogs/2015/06/22/git-flow-top-eclipse-mars-feature-3/
Comment 11 ChrisLE 2016-10-07 08:10:29 UTC
Any news here?
Comment 12 marinig 2016-10-09 09:30:53 UTC
(In reply to Ondrej Vrabec from comment #4)
> Can anyone please describe what is expected from the NB git support? Git
> flow does not bring anything extra new besides the methodology. Which you
> can of course achieve even now with the Git support.
> So basically an equivalent for "Create a new feature branch", you simply do
> Git -> Branch -> Create Branch and enter just "features/MY_FEATURE" as its
> name and select "Checkout Branch" option. Similarly to finish a feature
> branch you do "Merge" and then "Delete" the branch.
> As i see it this is just about making the process smoother and simply only
> grouping some commands together. Or not?

It is just as hermitzee said: it would be fantastic to have a faster way to do things as described by the git-flow directly in the Netbeans interface. 
I think you can do every step using the already available git commands but it would be very lengthy and error prone... So, if there would be a specific interface, managing a project following the git-flow pattern would be easy and fast!
In addition it would be interesting to have a dedicated graphic view of the repository initialized as required by git-flow, highlighting all the feature branches and so on...

Thank you
Comment 13 ChrisLE 2017-06-02 13:10:57 UTC
Anything new here? I prefer to implement the native Gitflow executable. It should be faster as the JGitflow wrapper. But it is only guessing. Native is often better than a wrapper. JGitflow is also ok and has some benefits for maven projects to change pom version numers.


By use of this website, you agree to the NetBeans Policies and Terms of Use. © 2014, Oracle Corporation and/or its affiliates. Sponsored by Oracle logo