blog.plasticscm.com
Plastic SCM blog: OS X Branch Explorer learns to filter branches
http://blog.plasticscm.com/2016/11/os-x-branch-explorer-learns-to-filter.html
Thoughts on version control, software development, branching and merging from the Plastic dev team. OS X Branch Explorer learns to filter branches. Saturday, November 26, 2016. Comes with another great feature for OS X users: now you can filter branches in the Branch Explorer! It is an added capability on top of the “inclusion/exclusion rules”. It works as follows:. Plans for OS X. At some point, we will be reapplying all these concepts to the Windows GUI, which we would like to refactor soon too. Put yo...
turiyaware.com
Plastic SCM and Microsoft Azure Virtual Machine Tutorial | TuriyaWare.com
http://www.turiyaware.com/plastic-scm-and-microsoft-azure-virtual-machine-tutorial
Plastic SCM and Microsoft Azure Virtual Machine Tutorial. Plastic SCM and Microsoft Azure Virtual Machine Tutorial. August 8, 2014. Update: Oct. 2, 2015) PlasticSCM has a new hosted cloud solution called Plastic Cloud. In a previous blog post. I explained how to use Plastic SCM GitSync with Visual Studio Online’s Git functionality. However, unlike Git or Mercurial, Plastic SCM. Is designed to handle large file sizes gracefully, which is good news for game developers,. Go to www.plasticscm.com. Click on &...
blog.plasticscm.com
Plastic SCM blog: Put your hands on a programming-language-aware, refactor ready, merge tool
http://blog.plasticscm.com/2013/04/put-your-hands-on-programming-language.html
Thoughts on version control, software development, branching and merging from the Plastic dev team. Put your hands on a programming-language-aware, refactor ready, merge tool. Tuesday, April 09, 2013. Merging source code files can rapidly become a nightmare if the files to be merged were first refactored. You move a method to a different location on a class while someone else modifies the same method, and then the resulting merge blows away the current-gen merge tools. Look at the following example:.
blog.plasticscm.com
Plastic SCM blog: p2pcopy: C# console app to transfer files peer to peer
http://blog.plasticscm.com/2016/10/p2pcopy-c-console-app-to-transfer-files.html
Thoughts on version control, software development, branching and merging from the Plastic dev team. P2pcopy: C# console app to transfer files peer to peer. Thursday, October 06, 2016. Back in late August, I was working from home. Then someone asked me to send a VMWare image to the office. The virtual machine was 17 GB in size so using Slack was not an option. Since I wasn't at the office, using a USB drive was not an option either. File transfer. the last frontier. Disclaimer: WebRTC already does this.
blog.plasticscm.com
Plastic SCM blog: Merging in Plastic Cloud is now available
http://blog.plasticscm.com/2016/11/merging-in-plastic-cloud-is-now.html
Thoughts on version control, software development, branching and merging from the Plastic dev team. Merging in Plastic Cloud is now available. Monday, November 21, 2016. We are happy to announce that it is now possible to merge branches using a Plastic Cloud server (it applies both to Team Cloud and Cloud Edition). We initially disabled it because we wanted to encourage users to stick to the distributed model (push/pull), but you sent us so many requests asking to enable it that we decided to release it.
blog.plasticscm.com
Plastic SCM blog: Path is too long fixed in Plastic SCM
http://blog.plasticscm.com/2016/10/path-is-too-long-fixed-in-plastic-scm.html
Thoughts on version control, software development, branching and merging from the Plastic dev team. Path is too long fixed in Plastic SCM. Wednesday, October 12, 2016. Ever faced the following issue while dealing with long paths in Windows? Microsoft has released the .NET 4.6.2 framework. And it fixes the “path is too long” error. This blogpost explains how to set up your machine to get the issue fixed. The fastest way to enable the feature is changing a Microsoft 10 Group Policy. C: Users manu cm mkwk w...
blog.plasticscm.com
Plastic SCM blog: Linus on branching...
http://blog.plasticscm.com/2010/11/linus-on-branching.html
Thoughts on version control, software development, branching and merging from the Plastic dev team. Monday, November 29, 2010. A few months ago, Linus Torvalds shared some interesting thoughts and concerns regarding the Git branching patterns being used in Kernel development. This is what Linus wrote (I only extracted a fragment, for the complete text, go to http:/ lkml.org/lkml/2010/9/28/362. Shooting a moving target. What is Linus talking about? Continuous integration delays the problem, but doesn̵...
blog.plasticscm.com
Plastic SCM blog: Merge recursive strategy
http://blog.plasticscm.com/2011/09/merge-recursive-strategy.html
Thoughts on version control, software development, branching and merging from the Plastic dev team. Tuesday, September 27, 2011. You’ve must heard about “git merge recursive strategy” which is the default algorithm that git uses when merging two branches. How does it work and why is it good? If you're interested on merge recursive you will probably enjoy this one too. 2013/10/02 - screencast available at http:/ youtu.be/Lg1igaCtAck. Basics – elements on a merge. The picture below shows how in this exampl...
blog.plasticscm.com
Plastic SCM blog: Linus Torvalds on GIT and SCM
http://blog.plasticscm.com/2007/05/linus-torvalds-on-git-and-scm.html
Thoughts on version control, software development, branching and merging from the Plastic dev team. Linus Torvalds on GIT and SCM. Sunday, May 20, 2007. I just finished watching the speech Linus Torvalds gave some days ago at Google, basically talking about GIT and Source Control Management. He has really strong opinions but I think the video is really worth watching. To be honest I was very shocked by some of the statements he made, like the following:. No comments. (Ok, err. I totally agree! As a key p...
blog.plasticscm.com
Plastic SCM blog: Driving a PITA merge conflict to the release branch
http://blog.plasticscm.com/2016/12/driving-pita-merge-conflict-to-release.html
Thoughts on version control, software development, branching and merging from the Plastic dev team. Driving a PITA merge conflict to the release branch. Friday, December 02, 2016. Everything was green and working automatically while merging a feature branch to our latest release branch. In fact, I was about to meet my colleagues in the coffee room for a break, but. Ouch! Hold on, not yet, not today! First of all, let's have a look at the conflicting file when merging the feature branch:. The three of the...