[ian_hn]

This is quick and easy. However if you need to work across more than one branch it might become tricky to manage, might need to cherry-pick commits carefully.