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 ...
24
votes
10answers
1k views

Do DVCSes discourage continuous integration?

Say there is a team of ten agile developers. Every day they each pick a task from the board, commits several changes against it, until (by the end of the day) they have completed the task. All ...
5
votes
3answers
316 views

Branching breaks continous integration?

I think this article, A Successful Git Branching Model, is very well known among experienced DVCS users. I use hg mostly, but I would argue this discussion is fine for any DVCS. Our current ...
5
votes
2answers
669 views

Good continuous-integration solutions for Haskell projects

I am looking for a good CI solution for a haskell project. Ideally something that will work with git. Really basic need (so far) build and run tests after each check in. Some basic reporting would be ...
4
votes
2answers
2k views

Examples of continuous integration workflow using git

Can anyone provide a rough outline of their git workflow that complies with continuous integration. E.g. How do you branch? Do you fast forward commits to the master branch? I am primarily working ...
4
votes
1answer
222 views

any issues with using git in a CI environment?

I work in a shop that lives by its CI process. We have traditionally used SVN and are considering moving to git (want to leverage its ease of branching, stashing, etc). Thinking in terms that a ...