when we deploy to production, we merge the feature branch into main but ensure to tag that release so it's easy to get back to the state of affairs at release - and importantly to have an easy way to access the exact

deploy.xml

at that time. So if you need to work again on that feature, you can just pull the

deploy.xml

as of that tag, even if the main repository has long since moved forward.