Tagged Questions
10
votes
2answers
1k views
How can one use git-flow effectively on a project in which more than one major version is being maintained?
I've migrated several of my projects over to the git flow work flow, and I'm loving it. However, I haven't found a best practice that keeps things flowing as smoothly when working with a project in ...
8
votes
4answers
912 views
Whats the work flow with 2 people on a project
I come to you as a newbie programmer who's been working on his own project (which is progressing nicely). My co-founder has also been learning how to program and has reached a point where he could ...
5
votes
1answer
306 views
Which commit to add issue/bug tracking ticket # to
I have been committing changes in git for a project over the last several months. I would like to start integrating Trac into my workflow. Generally, I have the 'git flow' style of git repository. I ...
4
votes
2answers
543 views
Is a merging strategy like Git Flow really an anti-pattern?
My company is using Git, and is using a peculiar branching scheme - work is done in master, and branches are reserved for releases. This works fine, so long as all of the work done in an iteration ...
4
votes
1answer
385 views
Is git-flow in the spirit of git? [closed]
The question is pretty self-explanatory. I've had some experience with git-flow, and not much more true experience with plain git before that. (I was using it more as a backup-provider.) I'm ...
4
votes
2answers
318 views
code review with git-flow and github
With regular git and github I can do a code review by simply creating a pull request of the feature branch I'm working on to the master branch. How would I do code reviews with git-flow? With workflow ...
2
votes
1answer
160 views
How should I incorporate a hotfix back into a feature branch using gitflow?
I've started using gitflow for a project, and I have an outstanding feature branch as well as a newly created hotfix. Per the gitflow workflow, the hotfix gets applied to both the master and develop ...
0
votes
1answer
144 views
Where does the git flow release message go? [closed]
When creating a release with git flow like:
git flow release finish <branch_name>
I'm prompted for a release message. I grepped around to see where this go, but no succes. Any idea?
0
votes
1answer
119 views
SourceTree app, how do I know what is my current branch?
I have branched from my develop branch bugfix/issue2 to work on a bugfix. Now that it's done I want to merge this branch bugfix/issue2 back onto develop but it's asking me if I want to merge into my ...
