Committing someone elses uncommitted changes to base and sidebar templates