2

here is my workflow. I have master as the most complete version of the program. If I want to add a feature I'll create a branch named with -feat as a suffix. as bugs come up, I'll create new branches from the feature with a -bug suffix. as bugs get solved they get merged back into the parent feature. If the feature branch has no bugs it can be merged back into master.

The problem is how do I track how branches are related. There doesn't seem to be a command to tell me what the last forked branch was. I also want to know what bug branches belong to a feature. (If it has no bugs it can be merged to master)

I could add a note in the commit log. forked from .... However I think this would cause it's own complications.

closed as unclear what you're asking by user40980, user53019, user22815, durron597, ratchet freak Jul 17 '15 at 22:03

Please clarify your specific problem or add additional details to highlight exactly what you need. As it's currently written, it’s hard to tell exactly what you're asking. See the How to Ask page for help clarifying this question. If this question can be reworded to fit the rules in the help center, please edit the question.

  • 2
    What are you using this for? Do you want a 'give me all the branches from master' type report? Note that you're probably looking for show-branch. You might want to flag this for migration (or delete and repost) to Stack Overflow (see Where does my git question go?). I believe that the answer to this is more of a 'tool use' than a 'concept' aspect. – user40980 Jul 16 '15 at 19:32
  • Have you tried using one of the various Git UIs (e.g. GitUp)? – jonrsharpe Jul 16 '15 at 20:16
  • I'm not sure I can really explain it better. when you come up with a feature you write some code, it's untested so you put it in a seperate branch. As you test it, Issues come up so you create a branch for that issue. The branch contains code to expose the problem. you can then leave it and work on other things. When you come back to the feature branch if there are no bugs related to the feature then you can merge it with master. – drawde83 Jul 16 '15 at 21:11
  • show-branches seems like it requires you to know which branches are related to use them in the command, which defeats the purpose. – drawde83 Jul 16 '15 at 22:17