January 2010
7 posts
3 tags
Single-merge `hg rebase --collapse`
`hg rebase` works well with merged branches. You can rebase a merged node perfectly. Additionally, with `—collapse`, you can hide the draft commits you might have done while developing. These help you do locally branched development. However, there’s a caveat. `hg rebase —collapse` actually does multiple merges. So if you have frequently changed common code chunks in the two...
2 tags
“It is to be all made of fantasy,
All made of passion and all made of wishes,...”
– Shakespeare, “As you like it”
“Ξέρεις, καμιά φορά, θαυμάζοντας, ξεχνάς οτι θαυμάζεις, σου φτάνει ο θαυμασμός...”
– Γιάννης Ρίτσος, «Σονάτα του σεληνόφωτος»
2 tags
“Rule #1 of photo equipment: If you can’t find your lens cap anywhere,...”
