Skip to content

Commit d5ab3db

Browse files
committed
TW review
1 parent dee8ba5 commit d5ab3db

1 file changed

Lines changed: 12 additions & 11 deletions

File tree

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

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -138,25 +138,26 @@ To set up your local SVN repository, follow these steps:
138138

139139
#### Workaround to Retain Branch Contents
140140

141-
During a migration without history, all branches except 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 backup branch contents and recreate them post-migration.
141+
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.
142142

143143
{{% alert color="info" %}}
144-
145-
We recommend first attempting these steps on a dummy project to familiarize yourself with the process.
146-
144+
Mendix recommends to first attempt these steps on a dummy project to familiarize yourself with the process.
147145
{{% /alert %}}
148146

149147
Follow these steps:
150148

151149
1. For each branch you want to retain:
152-
* Check out the SVN branch.
153-
* Merge the latest state of the main branch into the branch you want to retain. This ensures there is a common base, so conflict resolution on this branch will work post-migration.
154-
* Zip the entire project folder (except the *.svn* folder). Clearly name this so you recognize which branch it represents afterwards.
150+
151+
1. Check out the SVN branch.
152+
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.
153+
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.
154+
155155
2. Migrate to Git without history.
156-
3. Recreate the branches you wanted to retain. Do this **before** upgrading the main branch to a different Mendix version. For each branch:
157-
* Create a new branch from the main branch in Studio Pro and clone it locally.
158-
* Overwrite the contents of the project folder (except the *.git* folder) with the contents from the zip.
159-
* From Studio Pro, commit "Branch recreated" and push to server.
156+
3. Recreate the branches you wanted to retain. Do this before upgrading the main branch to a different Mendix version. For each branch:
157+
158+
1. Create a new branch from the main branch in Studio Pro and clone it locally.
159+
2. Overwrite the contents of the project folder, except for the *.git* folder, with the contents of the .zip.
160+
3. From Studio Pro, commit your changes with a *Branch recreated* message and push to the server.
160161

161162
### Migrating With History {#with-history}
162163

0 commit comments

Comments
 (0)