For extra info: merging the other way round does work!? The error occurs when I merge repository 'shared' INTO repository 'domUI', but merging 'domUI' into 'shared' works. It results in another oddity though: if I commit that and pull the result back into the original 'domUI' I get bug 282947. No idea whether these are related, just adding info.
For extra info: merging the other way round does work!? The error occurs when I merge repository 'shared' INTO repository 'domUI', but merging 'domUI' into 'shared' works. It results in another oddity though: if I commit that and pull the result back into the original 'domUI' I get bug 282947. No idea whether these are related, just adding info.