Posts

Showing posts from December, 2024

Sysprep command on AWS ec2 windows

  I recently ran sysprep command on ec2 vm running windows server. (sysprep.exe /oobe /generalize /shutdown which was provided by one of the popular AI/chat tools). The sysprep command ran fine. The initial intent was to create an AMI from this instance.  After sysprep command completed the ec2 instance stopped and next followed steps for creating an AMI. Steps were straight forward no issues. After I started this ec2 vm via AWS console, it showed as successfully started- however I could not rdp into this server. Looks like sysprep command has caused this issue. I got the system log for this ec2 instance (it is available via the AWS console) and it shows as below Windows is being configured. 'SysprepState=IMAGE_STATE_UNDEPLOYABLE' This means that rdp into this instance will not be possible. Essentially when you run Sysprep (especially with the /generalize and /oobe switches) on an EC2 instance, you are resetting Windows back to a state where it’s expecting to run first-boot co...

Git Merge Commit with Recursive Strategy vs ORT strategy

Image
When doing a git commit on two different versions of git I noticed that the commit message generated by git was different. In the newer versions, post 2024 versus older git versions like 2.30.x from 2020/2021 the merge strategy in git is different. Git Merge Commit uses a Recursive Strategy algorithm for performing merges. In newer versions of Git, e.g., 2.47.0 in November 2024 uses Optimized Recursive strategy (ORT). In earlier version of Git, e.g., 2.30.1 used Recursive Strategy. Example: The git message would be like "Merge made by 'ort' strategy (version 2.47.0) ORT strategy in git merge is an optimized version of the Recursive strategy where it identifies a merge base but employs an enhanced or more efficient algorithm for applying changes and resolving conflicts.  Recursive strategy in git merge can sometimes lead to complex conflict resolutions, especially when branches have diverged significantly.  Recursive strategy may also be slower due to its more extensive co...