Skip to content

Commit e3f7e30

Browse files
Update _index.md
1 parent 16f189f commit e3f7e30

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

  • content/en/docs/refguide10/version-control/using-version-control-in-studio-pro

content/en/docs/refguide10/version-control/using-version-control-in-studio-pro/_index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -331,9 +331,9 @@ The second method should be used if the first method is not possible for some re
331331

332332
#### Merging Using Git in the Command Line
333333

334-
Merging using Git in the command line or a third-party tool is not supported after the introduction of [MPRv2](/refguide/troubleshoot-repository-size/#mpr-format), which is the default format as of Studio Pro 10.22. External tooling can't correctly merge the *.mpr* and *.mxunit* files, which can lead to a corrupted branch.
334+
Merging using Git in the command line or a third-party tool is not supported after the introduction of [MPRv2](/refguide/troubleshoot-repository-size/#mpr-format), which is the default format as of Studio Pro 10.22. External tools cannot correctly merge the *.mpr* and *.mxunit* files, which can lead to a corrupted branch.
335335

336-
Within Mendix 11 a command as part of the [mx Command-Line Tool](/refguide/mx-command-line-tool/) will be introduced to allow merging on the command line.
336+
For Mendix 11, a command will be introduced as part of the [mx Command-Line Tool](/refguide/mx-command-line-tool/) to allow merging on the command line.
337337

338338
### Branching Best-Practices {#branching-best-practices}
339339

0 commit comments

Comments
 (0)