[da-anda]

Yep - as a rule of thumb - keep your master (and any remote/foreign branch you base on) clean and rather create a custom branch to add your changes there. Much easier to handle that way.