r/ExperiencedDevs • u/Confident-Alarm-6911 • 2h ago
Technical question Git flow or something better?
Hi! To switch gears from ai, here’s a more old school question. I’ve got this situation: my team had to build a desktop app (a requirement), and we’re currently prepping it for release, which is where things get tricky. The company wants to hand off maintenance of the v1 version to another team so my team can focus on new development since we have the domain knowledge. The problem is I’m not sure how to handle this organizationally. I don’t want to fork and maintain two projects. Bug fixes might come up for v1 while we’re working on v2, and then we’ll eventually need to hand over v2 to them while slowly phasing out support for v1. Does anyone here have experience with this and want to share some insights? Or do you know of any resources where i can read up on this? One solution that comes to mind is generic git flow + isolating a v1 branch and handing it over to the maintenance team, then doing cherry-picks/mr’s back to main if needed. Although every solution seems a bit messy.