>>All merging is done by the Integrator when code must be integrated on main branch, because in VFP automated merge can't be done without someone taking eye of the process, and when I say "merge" I don't refer to "merge of files on which nobody changes the same files", but the contrary, "merge of files on which same files can be changed by more than one developer"
>
>Yikes! Merging from multiple developers can get very ugly very quickly.
>
>>
>>
>>I think that, even if we not agree on all of this, this thread is really interesting, so we can change experiences on different work styles and workflows.
>
>Read this book then come back http://www.informit.com/store/continuous-delivery-reliable-software-releases-through-9780321601919

Thanks for the proposal Craig, but I prefer free reading. Can't afford the money for every published book.

My work style is more aligned as Git docs, like the really good links that Hank Fay posted (Thanks Hank!). *This* is decentralized working. All in trunk is not decentrilized working, and is for old SCM style working, not DVCS style working. If you use DVCS is because your team can be geaographically distributed,and not all together in same room or same office.

If you think about it, branching is something more natural, but for those who never tried simulataneous development with good practices for *this* model of work, then can be some difficult to understand it. You simply can't afford parallel working with "all in trunk" work style, because this is anti-pattern relative to parallel working.