> My current workplace has rebase as part of their flow Not really sure what that means as rebase can be used in multiple ways, but you might want to try using

> My current workplace has rebase as part of their flow Not really sure what that means as rebase can be used in multiple ways, but you might want to try using: `--force-with-lease` instead of `--force` > This option allows one to force push without the risk of unintentionally overwriting someone else’s work https://thoughtbot.com/blog/git-push-force-with-lease https://thoughtbot.com/blog/git-push-force-with-lease