> A merge conflict, unless spurious, that needs rebasing on the current trunk? I have just rebased it on the current trunk.
« Back to merge proposal
> A merge conflict, unless spurious, that needs rebasing on the current trunk?
I have just rebased it on the current trunk.