Otherwise you're going to have to force push to clean your master (which doesn't stay up to date tracking upstream master by default btw) when your feature lands