Sign up
Log in
My Platform
Tools
Tools
Go back
Downloads
IPP
Licensing
Learn
Learn
Go back
Training
Welcome
Guided Paths
Training Planner
Courses
Tech Talks
Classroom
Certifications
Documentation
Overview
OutSystems 11
Best Practices
How-to Guides
Community
Community
Go back
Home
Jobs
Forums
Forge
Ideas
Members
Badges
Support
OutSystems.com
Sign up
Log in
Community
›
Ideas
›
Improve Merge
Advanced Search
5
Followers
28
Likes
Improve Merge
Francisco Silva
Francisco Silva
at
+ 3
#3 626
in Community Rank
Collaboration
Implemented
on 24 Sep 2014
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!
Created on 14 Sep 2011
Comments (5
)
Kilian Hekhuis
21 Sep 2011
Kilian Hekhuis
MVP
Functional Specialist
at
MAIN Energie
+ 12
#2
in Community Rank
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
27 Dec 2012
Alexandre Costa
Programmer
at
Brim Sistemas Ltda
#4 484
in Community Rank
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
13 May 2013
Philip Prescott
at
#37 749
in Community Rank
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
16 Oct 2014
Gonçalo Borrêga
Sr. Director, Product Management
at
OutSystems
+ 3
#0
in Community Rank
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
17 Oct 2014
Francisco Silva
at
+ 3
#3 626
in Community Rank
So nice!! Great :)
views
750
Followers
5
Loading...
Loading
(hidden) New Badge Popup