If you're purely refactoring, lots of small (completed) changes merged back is good. When developing something, it may take longer to have good, tested, working code. In that case you want to keep it up to date with the latest changes (merge master into feature) but not merge back until done.
↧