tag:blogger.com,1999:blog-27232680.post5375876012550556972..comments2024-03-20T06:54:32.435+01:00Comments on Plastic SCM blog: Live to merge, merge to live...F3RD3Fhttp://www.blogger.com/profile/11524626976811746062noreply@blogger.comBlogger3125tag:blogger.com,1999:blog-27232680.post-64675886897312051292010-12-02T08:07:45.320+01:002010-12-02T08:07:45.320+01:00@pablo: yes that answers the question. very cool. ...@pablo: yes that answers the question. very cool. In our SCM+CI system, we are still constantly running into integration merge conflicts because our CI pipeline gets very deep sometimes. 20-30 turnins. It takes half a day for one integration which is typically 8 wide. So you can image it takes a while for a turnin to make into trunk. I am thinking of a method of performing speculatively merging against our pipeline before sending to our CI system.Gregory Czajkowskihttps://www.blogger.com/profile/12121946616468643154noreply@blogger.comtag:blogger.com,1999:blog-27232680.post-15473310858639053892010-12-02T00:02:41.661+01:002010-12-02T00:02:41.661+01:00@Gregory: sure, from the CLI you can run cm merge ...@Gregory: sure, from the CLI you can run cm merge and it will tell you the result, and from the GUI you always have a preview before merging.<br /><br />Then you can also do cm merge --merge to actually force the merge...<br /><br />Let me know if it helps.Pablo Santoshttps://www.blogger.com/profile/08083682682597484025noreply@blogger.comtag:blogger.com,1999:blog-27232680.post-75451471405890173482010-12-01T23:12:03.393+01:002010-12-01T23:12:03.393+01:00Does Plastic SCM support speculative merging? and ...Does Plastic SCM support speculative merging? and what I mean by this, is a preview of merging. That is checking whether a branch <b>would</b> merge cleanly/automagically with another branch/trunk without actually completing the process and consequences of merging.Gregory Czajkowskihttps://www.blogger.com/profile/12121946616468643154noreply@blogger.com