Aug '09
23
Git Merge conflicts
I can never remember how to keep the local version of a file when a git merge has a conflict. Following this blog. To keep OUR copy of the file index.html after a git merge git reset — index.html git … Continue reading
Aug '09
23
Ext3/4 performance
I’ve converted my /home partition to EXT4, and running my root partition as EXT3. While EXT4 looks good, for some reason i’m getting bad write performance on RAID1, compared to a normal JBOD disk, which i would expect to be … Continue reading
Aug '09
15
New Filesystems – EXT4 and BTRFS
EXT4 is now considered stable since 2.6.28, there is a good article here. Its a lot better than ext3, which really only added Journals over ext2. In particular EXT4 now supports Extents, Delayed Allocation and Multiblock Reservations, as thats the … Continue reading
Aug '09
01
Debian 5 on Microsoft Vitrual PC
To be able to test a Debian 5 Mirror install, I setup virtual PC on XP, as i had the environment already. The new Kernel kills the VM by default, so press TAB on the “Install” prompt, then enter the … Continue reading
