Merge pull request mendix#3 from mendix/solp/3138-port-fix-cherry-pick-11

Change from port fix to cherry pick

Author: MariaShaposhnikova

content/en/docs/refguide/modeling/menus/version-control-menu/merge-dialog.md

@@ -18,7 +18,7 @@ To access the **Merge** dialog box, open [Version Control](/refguide/version-con
 
 Available scenarios are described in sections below.
 
-## Port Fix
+## Cherry Pick
 
 This scenario allows you to move a fix from a maintenance branch line to the main line. If you just want to redo a small fix, a single commit is often enough.
 
@@ -28,14 +28,18 @@ Port fix transports the actual commit from one branch and directly applies it, i
 
 Choose the branch line from which you want to merge the fix.
 
+{{< figure src="/attachments/refguide/modeling/menus/version-control-menu/merge-dialog/cherry-pick-details.png" alt="Cherry Pick Details" class="no-border" >}}
+
 ### Revision
 
-Choose a revision that you would like to port fix.
+Choose a revision that you would like to cherry pick.
 
 ## Merge Feature Branch
 
 This merge scenario allows you to merge a complete feature branch line to the main line.
 
+{{< figure src="/attachments/refguide/modeling/menus/version-control-menu/merge-dialog/merge-details.png" alt="Merge Details" class="no-border" >}}
+
 To merge the whole branch back to the main line to integrate a new feature there, do the following:
 
 1. Open the main line.

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

@@ -232,7 +232,7 @@ Select the **Version Control** menu > **Revert a Commit...** to revert a commit.
 {{% alert color="warning" %}}
 Reverting a commit creates a new commit that undoes the changes introduced by the original commit. This may lead to unexpected results depending on the context of the original commit.
 
-* **Port fix and reverting** – If you used [Port Fix](/refguide/merge-dialog/#port-fix) to apply a commit from another branch to the current branch, and then you revert that commit, the changes from the cherry-pick will not be reapplied when merging the full branch. This happens because the revert commit explicitly negates the cherry-picked changes, and Git recognizes them as already addressed.
+* **Cherry picking and reverting** – If you used [Cherry Pick](/refguide/merge-dialog/#cherry-pick) to apply a commit from another branch to the current branch, and then you revert that commit, the changes from the cherry-pick will not be reapplied when merging the full branch. This happens because the revert commit explicitly negates the cherry-picked changes, and Git recognizes them as already addressed.
 * **Merging and reverting** – If you [merged another branch](/refguide/version-control/#merging-branches) into the current branch and then reverted the merge commit, merging the same branch again will not reapply its changes. Git identifies that the merge was undone and prevents those changes from being reapplied.
 {{% /alert %}}
 
@@ -311,7 +311,7 @@ If you have multiple development lines, you sometimes want to merge changes from
 
 Merging is always done while you have a working copy open. The merge will result in extra local changes in that working copy. It is advisable to commit local changes first before merging extra changes into a working copy. Otherwise, the uncommitted local changes and the changes caused by the merge will be combined and it is very hard to untangle them if you are unhappy with the merge. Studio Pro will warn you if you have uncommitted changes.
 
-Select **Version Control** > **Merge Changes Here**, after that you can select **Port fix** or **Merge feature branch** options. For more information on merge settings, see [Merge Dialog](/refguide/merge-dialog/).
+Select **Version Control** > **Merge Changes Here**, after that you can select **Cherry Pick** or **Merge feature branch** options. For more information on merge settings, see [Merge Dialog](/refguide/merge-dialog/).
 
 #### Replacing the Main Line with a Branch Line