And it is also the one that makes the most sense to me.
If you have a branch with some changes and the next commit on trunk
contains a file you have changed and another file you haven't changed.
It is one commit, so all or nothing, it can contain breaking changes
if you merge half a commit. So, do
> in CVSNT there's a feature called magic branches. Basically it
> means that
> if you branch from head (or any other branch) the all the files in
> the
> magic branch will continue to have all changes made in the future
> until
> the point where you change them. So if you have 20 files and you
> c