Blog
I’ll be using them more often from now on.
I have a reply to comments about resolving conflicts. I believe there’s no difference in number of conflicts, whether you commit to the trunk or merge the branch. If conflicts exist in a branch, thay would also exist when committing to trunk.
The only difference is that when merging branch to trunk (or other direction), you have to resolve all conflicts together. But sometimes that is better – I don’t want to worry about them every time I commit, but I’m prepared to work on them at the end of subproject.
