We have a Problem in a migrate existing TFVC to GIT using the GIT-TFS, we have already an existing project in AzureDevOps, that has already created some branches.
The structure is DEV -> Main -> ProdRel
But the Hierarchy is wrong, is set as: DEV -> Main and ProdRel -> Main.
As part of the problem we have some ongoing work between Main a ProdRel that is not going to be at ProdRel soon.
I tried to many things but at this moment I feel is not possible to migrate to GIT in a clean way, because when I set the hierarchy well and tried to migrate it doesn't recognize the parent changes and rise some conflicts.
Things tested
- Change the hierarchy to the correct one on TFVC, and migrated to GIT using GIT-TFS: I have a problem because when I migrate the ProdRel Branch it doesn't know who is the parent of the changes, because it has 2 parents.
Other options
Migrate TFVC to GIT and from GIT to TFVC, I didn't find how to migrate from GIT to TFVC.
Is possible to do this?
Thanks Kind Regards