Hotfix Strategy in Git

By -
Git branching is usually pretty straight forward and although merging can be a hassle it is important to remember the reasons for the isolation.

In the event a hotfix is required, it is handy to branch off from master instead of develop - this way we can test the fix on the develop branch before merging back to master.

The beauty of this makes git so powerful and the reason it's the most popular software version control software at the moment.

Also a quick mention that git branch --merged to see what's now part of the new master as this will list each individual feature, bugfix or hotfix as a list. Great for generating release notes.


Comments

Post a Comment

Popular posts from this blog

WinDBG on 32Bit Applications

By -
On a 64-bit Windows installation is it possible to make both 32-bit and 64-bit dumps of 32-bit processes. The task manager will create a 64-bit dump, which therefore is often what you end up with users sending you. This is not a problem for native executeables since you can still load it in windbg and use the !wow64exts.sw extension to switch into the 32-bit view. However if your process is a .NET process and you want to use SoS to investigate it then you are out of luck, you'll just get the message "SOS does not support the current target architecture." This extension gets around this by hooking/patching functions in dbgeng.dll so that SoS thinks it's working with a 32-bit dump. ** Usage ** Copy soswow64.dll into the "winxp" subfolder of windbg. Then after loading a 64-bit memory dump of a 32-bit process you can simply load the extension: 0:000> .load soswow64 Successfully hooked IDebugControl::GetExecutingProcessorType. Successfully patched DbgEng!X...
Read more

EXCEL Macro - Compare Column A to Column B

By -
Recently a friend asked me to fix a macro that she was working on to compare two columns in Excel and if the cell in Column A did not exist in any cell of Column B, then add it to Column C. You can make check both columns for miss matches by copy/pasting Column B to Column A and vice versa to check both lists and maybe someone will find it handy =) Sub Subset() Dim Acell As Range 'Acell is a range of 1 or more cells Dim Bcell As Range 'Bcell is a range of 1 or more cells Dim Ccell As Range 'Ccell is a range of 1 or more cells Dim Index As Integer 'Index is the current row we are saving to in the Ccell Index = 1 'Start the Index at 1 Dim found As Boolean    'Remove the hidden space 160    Range("A1:A1000").Replace What:=Chr(160), Replacement:="", LookAt:=xlPart    Range("B1:B1000").Replace What:=Chr(160), Replacement:="", LookAt:=xlPart    For Each Acell In Range("A1:A1000")     Acell...
Read more

Powershell Script to Automatically Deploy Sharepoint WSP Packages

By -
Recently I wanted to automate the retraction, removal and deployment of WSP packages in a folder. So I wrote this powershell script. NOTE: There is a bug in the script that returns a false positive. The property $solution.Deployed returns true even though the object is not finished deploying or is locked! I will update this code or if you do then please send your updated code and I will update my post. $packages = (dir *.wsp | Select-Object name) $currentDir = (Get-Location).Path Add-PSSnapin Microsoft.Sharepoint.PowerShell -ErrorAction "SilentlyContinue" Write-Host "Started package installation" foreach ($i in $packages) { Write-Host "Retracting: " + $i $solution = (Get-SPSolution | where-object {$_.Name -eq $i.Name}) Write-Host $solution.Name if ($solution -ne $null) { Write-Host "Solution Found..." if ($solution.Deployed -eq $true) { Write-Host "Uninstalling..." Uninstall-SPSolution -Identity ...
Read more