I cut the constructor from and pasted it into, and checked the resulting changes into Bob. I then switched back to the original version and created a branch called Bob. I then edited the file to add a comment in the constructor, and checked it in.
#Tortoisehg personal tag code#
I loaded the code for the latest version of my Comment Timeout WordPress plugin into a new git repository and created a branch called Alice. Of course, this is very easy to test, so on Friday evening, I decided to test it. It’s a plausible claim-I’m pretty sure that such a merge algorithm is doable-and it would also be particularly useful, since it would open up several more possibilities for the kind of refactoring that you can manage in a distributed workflow with parallel work streams. The merge algorithms in distributed source control are a vast improvement on Subversion, which falls over on all but the simplest cases, but contrary to the claims of some, they are not omniscient.įor example, it is commonly believed that Git can track functions being moved from one file to another, and merge in the changes appropriately.
0 kommentar(er)
