Posts Tagged ‘Git’


How Git branches affect files on disk

Wednesday, May 25th, 2016 by June Blender
When I started using Git back in 2012, I wasn't new to source control systems. I used a database-backed source control system back in the 80's and, at Microsoft, I used Visual Source Safe (VSS) and Team Foundation Server (TFS). I was a whiz at checking files in and out, examining and comparing versions, and restoring versions. Still, when I started to use Git for the Azure "help drawer" docs, I was totally unprepared for the effect of changing branches on Git-managed files on disk. Git Checkout -- An Example Here's an example. I'm working in my fork (my online…   More »

GitHub: How to update your fork

Monday, May 16th, 2016 by June Blender
Like almost everyone in the DevOps world, I use GitHub, not because I like it, but because everyone uses it. In fact, I dislike it, because it’s confusing by design. Its misleading language excludes users, rather than welcoming them. To use it, you have to forget the actual meaning of words in English, or even their technical meaning, and use them as though they are arbitrary strings. Worst of all, because most people memorize a command sequence without fully understanding how it works, when something goes wrong, it’s almost impossible to troubleshoot. Okay, enough ranting. I just discovered a solution…   More »

PowerShell Studio 2015 – New Custom Menu Features & GIT template

Thursday, October 1st, 2015 by David Corrales
We are continuing to cover the new features introduced in the latest service build of PowerShell Studio 2015 (v4.2.95). In this article we will cover the new additions to PowerShell Studio's custom menu. For those who aren’t familiar with the custom menu, it is a menu that users can customize to call other tools and processes. The menu’s contents can be determined on a global level or a local folder level. Please refer to the following article for more details on the custom menu feature:   Application vs Commandline We added an optional [Application] group to the CustomMenu.inf. Any…   More »

VersionRecall adds file locks

Thursday, August 20th, 2015 by Alex Riedel
Source control systems usually operate in one of two ways: Check-in and check-out or with a concurrent submit. Check-in and check-out makes it easy to coordinate access to files in a project by team members. While a file is checked out, no one else can can submit a modification to that file until that particular team member checks it back in. Anyone who used our ChangeVue product, Microsoft SourceSafe or Microsoft Team Foundation Server is familiar with this type of system. VersionRecall operates with just a simple submit at any time. If you have conflicts between versions submitted by…   More »

VersionRecall 2014: FAQ

Wednesday, April 9th, 2014 by Alex Riedel
Over the course of the weeks since the release of VersionRecall 2014 we have received a number of questions. Here is a list of the most common ones and the answers to them.   Question: Why do you not just submit a file each time it is modified? Answer: While developing scripts, most people frequently save and run to verify that what they have done so far works. Creating a new version each and every time a file changes creates many versions of a file, which in turn requires you to weed out the unwanted versions at some point.…   More »

PowerShell Studio 2012 with GIT, Subversion and Mercurial Oh, my!

Tuesday, January 8th, 2013 by David Corrales
Similar to PrimalScript 2012, we received requests to add support for GIT, Mercurial, and Subversion in PowerShell Studio 2012. The difficulty of supporting all these various source control solutions is that they all have different APIs and change over time. The varying nature of these tools could potentially make the integration outdated fairly quickly. One thing in common all the source controls solutions previously mentioned have is command line tools. We’ve used this common factor to resolve the problem. Our solution to the problem is the new custom tool menu: The custom tool menu allows you to customize and execute…   More »

Using GIT, Subversion and Mercurial with PrimalScript 2012

Tuesday, December 11th, 2012 by Alex Riedel
For quite some time we have been asked to add support for the aforementioned version control systems to PrimalScript. But every time we looked into it, the API changed or the preferred system du jour changed. We didn’t want to add support for too many API’s that get potentially outdated fast. But most importantly, many folks we asked indicated that they use more than one system. GIT for their own files, Mercurial for customer A and Subversion for customer B. Even worse, some clients seem to insist that some homegrown system is used that either has no API or is…   More »