Stefan Reichör <[EMAIL PROTECTED]> writes:
> star-merge: unable to merge unrelated trees.
I don't know the exact reason for this, but here are some solutions:
1) you could have tagged the mainline instead of tagging your own
branch.
2) From within Xtla, if you're sure you have all the patch of my --0.1
version, you can use tla-replay to replay my --0.9--base-0, and
star-merge will then see that you have a patch from my version, so
you'll be able to star-merge again.
3) You could use
tla apply-delta <patch not merged from the mainline's 0.1> \
<last patch from mainline's 0.9>
4) you could implement tla-apply-delta in Xtla and use it instead of
3) ;-)
--
Matthieu
