VSCodium avoids this entire issue. It is a community-driven option for those who don't want the proprietary distribution ...
Run eight agents in isolated work trees inside Cursor 2, so you finish complex changes sooner while avoiding messy merge ...