Branching, in revision control is the duplication of an object under revision control so that modifications can happen in parallel along both branches.
29
votes
13answers
3k views
To branch or not to branch?
Till recently my development workflow was the following:
Get the feature from product owner
Make a branch (if feature is more than 1 day)
Implement it in a branch
Merge changes from main branch to ...
7
votes
1answer
208 views
Git bug branching convention
I've been following the successful Git branching model guide for most of my development. I still wonder if the way I handle bug tickets is correct.
My current workflow: Once I accept a bug ticket I ...
6
votes
4answers
558 views
How do you put different versions of your library under version control? Do you use tags? Or branches? Or another method?
I have recently started putting my code under version control (in the lab I'm working, under SVN, and my own codes in github (obviously with git)). Before using version control, I used to do something ...
8
votes
3answers
1k views
Source Control: Roles and Responsibilities - Best Practices
I'm looking for "Best Practices" concerning roles and responsibilities, specifically who is responsible for merges from development branches to trunk (or main). Basically I'm looking for ammunition to ...
3
votes
2answers
1k views
Git branching and tagging best practices
I am currently learning to use Git by reading Pro Git. Right now I'm learning about branching and tags. My question is when should I use a branch and when should I use a tag?
For example, say I ...
8
votes
3answers
270 views
dvcs - is “clone to branch” a common workflow?
I was recently discussing dvcs with a coworker, because our office is beginning to consider switching from TFS (we're a MS shop). In the process, I got very confused because he said that although he ...
4
votes
2answers
295 views
How to deal with undesired commits that break long-running release builds?
We ran into an unfortunate situation at work recently and I've been wondering what we can do to avoid similar problems in the future.
We make embedded systems. The FPGA code is in one SVN repository ...
0
votes
1answer
119 views
Git commit messages with nvie branching model
This Git branching model recommends branching for all development efforts and merging when complete:
Branch
Develop
Merge when complete
I'm wondering how this works in practice, given that ...
