Rewrite of the old post.
when you have a merge you have to do the following.
1-click publish again.
when you "forget" to do step3, you probably and up with another merge because people develop fast.
what did I want.... a 1 click publish, so I epxect this behaviour:
you have succesfully deployed the espace.