SmartGit branching and merging