Training
Training
Welcome
Guided Paths
Build an App
Training Planner
Courses
Developer Schools
Boot Camps
Certifications
Tech Talks
Documentation
Documentation
Overview
ODC
O11
Forums
Forge
Get Involved
Get Involved
Home
Jobs
Ideas
Members
User Groups
Downloads
Platforms
OutSystems.com
My Platform
Community
Resources
Support
Search in OutSystems
Log in
Sign Up
Back to Ideas
28
Like
Follow Idea
Francisco Silva
Improve Merge
1213
Views
5
Comments
Implemented
Collaboration
OutSystems 9
Most of times, the merge tool should be automatic...
If one developer has change one screen and other developer a diferent one, why should i have to merge the two versions?
Anyone familiar with CVS, SVN, GIT, etc will agree with me!
Kilian Hekhuis
MVP
Well, for one, it would be very difficult to come up with a set of rules when automatic merge would cause no problems, and when it would. Also, in many cases you'd want to check anyway the changes made by the other developer.
Merge could be improved quite a bit, but automatic merging is always tricky.
Alexandre Costa
I find this idea very important, because working with several developers using OutSystems with manual merge is slow, boring and much of the merge can be done automatically as is done in tools like Git, VNC and others.
Philip Prescott
In many cases, the merge tool causes more issues than we would have should we just upload. I would love to see some more intelligence built into the merge tool.
Gonçalo Borrêga
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.
Francisco Silva
So nice!! Great :)
Log in to comment
Loading...