All merge of of trunk from unstable can cause conflicts if for example > someone deleted or renamed a file in one changeset and someone else > modified the same file in another changeset.
This is also another issue that can be solved with using Git because of rebasing. Rebasing branches undoes all of the commits you've done up to the point at which you started the branch. It stores them away and then pulls down all of the new commits that were done on the parent that you created the branch from. Once it has all the commits they're reapplied to the branch in chronological order so you can maintain a perfect commit history and be able to resolve conflicts as they happen in small chunks as opposed to trying to resolve huge changesets like you do in SVN. Git, git, git! -omar
