Merge pull request mendix#10354 from tknippenberg/RetainingBranches

Added Git migration workaround branch recreation

Author: NicoletaComan

content/en/docs/developerportal/repository/team-server/migrate-to-git.md

@@ -136,6 +136,29 @@ To set up your local SVN repository, follow these steps:
 
     {{% alert color="info" %}}To inspect files from a historical revision, use **TortoiseSVN** and select **Update to revision** to check a specific revision.{{% /alert %}}
 
+#### Workaround to Retain Branch Contents
+
+During a migration without history, all branches apart for the main branch are removed. As it is not always possible to converge all branches by merging them into the main branch, you can manually back up branch contents, and recreate them post-migration. 
+
+{{% alert color="info" %}}
+Mendix recommends to first attempt these steps on a dummy project to familiarize yourself with the process.
+{{% /alert %}}
+
+Follow these steps:
+
+1. For each branch you want to retain:
+
+    1. Check out the SVN branch.
+    2. Merge the latest state of the main branch into the branch you want to retain. This ensures there is a common base, so you can resolve any conflicts on this branch post-migration.
+    3. Create a compressed .zip version of the entire project folder, except for the *.svn* folder. Clearly name the .zip folder so you recognize which branch it represents afterwards.
+
+2. Migrate to Git without history.
+3. Recreate the branches you wanted to retain. Do this before upgrading the main branch to a different Mendix version. For each branch:
+
+    1. Create a new branch from the main branch in Studio Pro and clone it locally.
+    2. Overwrite the contents of the project folder, except for the *.git* folder, with the contents of the .zip.
+    3. From Studio Pro, commit your changes with a *Branch recreated* message and push to the server.
+
 ### Migrating With History {#with-history}
 
 During migration with history, all app history, including revisions for all branches, is copied from SVN to Git.