Merging Improvements

By Philip Prescott on 13 May 2013
I have seen a few of these posted here, but will reiterate since they are still relevant. 
  • Auto publish after a merge has completed when initiated from 1-click publish. 
  • A visual signifier or auto-selection (or dont even show the item) when you are the only one who has touched it since last publish. Large merges are very painful and troublesome when you have just finished changing 40+ things, and your coworker has as well. Even knowing that you havent worked on the same things, you still have to dig through and check every single thing they touched, and this can cause a lot of unintentional overwrites.
  • A "Select last modified for all" option. This applies to us 98% of the time. 
  • Increase the default serialization amount in the IDE config past 65k. We publish quite a bit, and after a certain point are not able to push the merge with published button to merge because of IDE errors. 
J.21 May 2013
  • Make it more visual who has last changed it
Goncalo Borrega16 Oct 2014
With Platform 9, if there are no conflicting changes, the merge is done automatically, and (once you confirm) the publish proceeds. The platform automatically detects who has changed what based on the original (base) version. 

After several usability tests, we decided to allow you to make the final decision, by confirming that you do want to "Merge and Publish". Doing it all automatically was causing users to feel they were losing control and that the platform might not be doing what you really wanted. It also allows you to forcely overwrite what the other developer has done, if so required, or open the merge window (hit Compare) to have better control over exactly what is merged. When that happens, the merge options are automatically preselected, so that you don't have to think about it that much.

Ali Ahsan6 Apr 2015

Can anybody help me understand why merge downloads the file twice?

Also, if I want to compare my espace opened in Service Studio with another file on my hard disk, why does it download the espace from server?