I could not find any technical articles on merging trunk changes to branch. I just tried to merge trunk changes to a branch I created, but I experienced a "Server Error - Please contact your Administrator" message.

I realize most people are merging changes from branch into trunk. But I have a unique situation where I need to do this in reverse.

If you just merge the branches into the trunk you are doing the same thing.

When you "merge" you are combining everything in each project, so the order shouldn't matter and I cannot think of a situation where it would.

I also don't think you are able to merge the trunk into the branch as that's what the branch was created from.

Sent with Good (www.good.com)

Hello @Travis Cole ,

as far as I understood this is a one way - you can go only from branch to trunk.

The only thing you can do is to create a new branch but I guess this will not help - otherwise you wouldn't have asked. 

Did you create already a ticket with support team? I would be interested to know the outcome too :-)

Many thanks in advance!

Best regards

Thomas

Hi, I’m with thomas.palle@linde.com">Thomas Palle on this. The whole concept is that you create a branch from the trunk, try out various changes and then merge one or more branches back into the trunk which is your main project.

Might be worth re-visiting Branching, Hotfix, and Branch best practices to see if this has any additional help.

Of course, it could be I’m totally missing the point?

I would agree with you @Travis Cole, Gary Hodgkins and thomas.palle@linde.com">Thomas Palle if Apptio does not have this selection on in the Check In History entries.

Why would it provides a choice to merge the changes to branch? I will ask Apptio about this today. By the way, I did review the Best practices: Branching projects before I post this question. Nowhere in the document it talks about that merging changes from trunk to branches cannot be done either.

@Tony Wong

It does mention this, however it says it is possible just not best practice so strange you are getting the error.

Thanks, @Travis Cole. I missed that section you highlighted. I wonder why don't Apptio remove the feature if they don't recommend it as best practices.

I was simply avoiding creating too many branches. It was just one entry that I try to merge without waiting for the whole branch creation duration.

I asked the Apptio's CSM today and he shed some light on this. He merges trunk changes to branch quite often. Apparently my issue could be related to the size of the merge change I was exceeding. The entry I was trying to merge has 22 uploads. So I need to break them in "bits and pieces" to merge in different phases.