3 ms·

Correct me if I'm wrong but isn't this just a form of centralised version control? If this is a better approach for many teams, perhaps this an indication that

Correct me if I'm wrong but isn't this just a form of centralised version control? If this is a better approach for many teams, perhaps this an indication that DVCS weren't the silver bullet they were hyped up to be. Aside from that, in my opinion the whole centralised version control vs. decentralised version control, and all the variants thereof, miss the bigger issue. Keeping track of the history of a file, and the authors of the changes, is trivial for any version control system. The real challenge is in resolving merge conflicts, and it's the low level of sophistication in merge tools that is the real bottleneck here. That's why I think tools like Semantic Merge are far more important to a development workflow than SVN vs Git vs Mercurial. It relies on the merge tool understanding the structure of code rather than treating it as an ordinary text file. Similar tools could be built for any language that offers a 'compiler as a service' (such as RLS for Rust). https://www.semanticmerge.com/ https://www.semanticmerge.com/

paul_h 10y ago
SemanticMerge mentioned on the site: https://trunkbaseddevelopment.com/game-changers/#plasticscm-s-semantic-merge-2013 https://trunkbaseddevelopment.com/game-changers/#plasticscm-.... It got it's name after I blogged about it too - http://paulhammant.com/2013/02/14/features-i-would-love-source-control-tools-to-have/ http://paulhammant.com/2013/02/14/features-i-would-love-sour... - and am still owed a beer.
- ZenoArrow 10y ago
  Thanks for the links, I'm glad you identified this as an issue and inspired further development of a solution (though I'm surprised you're owed a beer for such an obvious name, must've taken all of about 5 seconds to think of that one ;-) ). Also found this article in the comments of your blog to be interesting: http://blog.plasticscm.com/2013/04/put-your-hands-on-programming-language.html?m=1 http://blog.plasticscm.com/2013/04/put-your-hands-on-program... This article you linked to was interesting too, is this a common workflow on CI solutions now?: https://blog.snap-ci.com/blog/2013/11/07/automatic-branch-tracking-and-integration/ https://blog.snap-ci.com/blog/2013/11/07/automatic-branch-tr...

paul_h 10y ago

SemanticMerge mentioned on the site: https://trunkbaseddevelopment.com/game-changers/#plasticscm-s-semantic-merge-2013 https://trunkbaseddevelopment.com/game-changers/#plasticscm-.... It got it's name after I blogged about it too - http://paulhammant.com/2013/02/14/features-i-would-love-source-control-tools-to-have/ http://paulhammant.com/2013/02/14/features-i-would-love-sour... - and am still owed a beer.

ZenoArrow 10y ago
Thanks for the links, I'm glad you identified this as an issue and inspired further development of a solution (though I'm surprised you're owed a beer for such an obvious name, must've taken all of about 5 seconds to think of that one ;-) ). Also found this article in the comments of your blog to be interesting: http://blog.plasticscm.com/2013/04/put-your-hands-on-programming-language.html?m=1 http://blog.plasticscm.com/2013/04/put-your-hands-on-program... This article you linked to was interesting too, is this a common workflow on CI solutions now?: https://blog.snap-ci.com/blog/2013/11/07/automatic-branch-tracking-and-integration/ https://blog.snap-ci.com/blog/2013/11/07/automatic-branch-tr...