Fixed pushing trunk merges when the feature branch has local modifications.

In this case, a temporary branch is created to hold the local modifications, and the feature branch is reset to origin, merged and pushed.