Lars Gullik Bjønnes wrote:
Abdelrazak Younes <[EMAIL PROTECTED]> writes:
| Lars Gullik Bjønnes wrote:
| > Abdelrazak Younes <[EMAIL PROTECTED]> writes:
| > | | I am doing that right now... difficult.
| > No it is dead easy if you followe the 3 step rebase procedure that I
| > have posted ealier.
|
| Svn rebase is dead easy with my procedure also. The problem was in the
| conflict between Peter geometry work and my cleanup work. Unless your
| merge program is much more intelligent that svn merge I don't think it
| would be any easier if I follow yours.
Ok please explain your 5 step method that is the same with every
rebase.
(And one that actually does a rebase, not one that just mergers
individual revisions in from trunk)
Actually, I don't know what a rebase is. It is not in the TortoiseSVN
doc which explains how to maintain a branch and how to merge it back.
That's what I followed. As for the details I sent them some time ago but
I cannot find them. I basically merge sequentially until I find a
potential conflict. I fix it, manually if needed, and I continue until
the next potential conflict. If I do that often enough, it is dead easy
to stay up to date.
Abdel.
