Michael Gerz wrote:
Georg Baum wrote:
That is the same with the other procedure. The key is the
<previousSync> revision. You can't do anything wrong with both methods
if that one is right. With your method you need to remember it
somewhere, with the one described on the wiki you can get it from svn.
Most important: Merging with trunk is not cherry picking. You have to
merge sequentially. If you skip some revisions because they look too
complicated and you are a lazy boy, then we (not only the branch
maintainer) are lost! Depending on the life-time of a branch, there is
no chance to fix (or even detect) the problems later.
Abdel, do you agree?
I think so. I always merge sequentially and I don't continue with the
merging if one commit is not completely merged.
Abdel.
