Needs rebasing on the current trunk to resolve the conflicts.
(the lower versions have conflicts too, you can try rebasing those branches as well, as GCA revision has advanced yesterday, but the conflicts there might be unavoidable for a GCA rev and will have to be resolved during the merge to trunk).
Needs rebasing on the current trunk to resolve the conflicts.
(the lower versions have conflicts too, you can try rebasing those branches as well, as GCA revision has advanced yesterday, but the conflicts there might be unavoidable for a GCA rev and will have to be resolved during the merge to trunk).