Git: Safely merge overlapping directories across repositories
My team and I work on a large repository with some core plugins and multiple independent floating plugin repositories. Recently, a plugin has been promoted to the main repository with some changes, but I also have a WIP feature on the old repo. I’d like to safely merge my changes from the old repo to the new subdirectory.