Unfortunately you've got a ton of merge conflicts here. Can you try merging from the latest trunk onto your branch and push it back to your branch?
« Back to merge proposal
Unfortunately you've got a ton of merge conflicts here. Can you try merging from the latest trunk onto your branch and push it back to your branch?