4 ms·
SemanticMerge mentioned on the site: https://trunkbaseddevelopment.com/game-changers/#plasticscm-s-semantic-merge-2013 https://trunkbaseddevelopment.com/game-ch
by 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 agoThanks 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...