#UnityTips If you do a git rebase and you decide on a merge strategy then „mine“ and „theirs“ work counterintuitively.
e.g. if you rebase a feature branch onto the latest develop with:
„git rebase -X mine develop“
the commits of the develop will be „mine“#gamedev #indiedev pic.twitter.com/b8LX3TiVC4
— Binary Impact (@BinaryImpactG) September 20, 2022