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
