Develop your topic branch separate from master
git-fetch will acquire changes from master as before
It just won't merge them to whatever your current branch happens to be
