Skip to content

Commit c49995a

Browse files
Change port fix to cherry pick for Mx10
1 parent 204dff9 commit c49995a

File tree

2 files changed

+3
-3
lines changed
  • content/en/docs/refguide10

2 files changed

+3
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ To access the **Merge** dialog box, open [Version Control](/refguide10/version-c
1818

1919
Available scenarios are described in sections below.
2020

21-
## Cherry Pick
21+
## Cherry Pick {#cherry-pick}
2222

2323
{{% alert color="info" %}}
2424
This functionality was known as **Port fix** in previous versions of Studio Pro. It has been renamed to **Cherry pick** to keep it more consistent with the native Git name.

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
@@ -232,7 +232,7 @@ Select the **Version Control** menu > **Revert a Commit...** to revert a commit.
232232
{{% alert color="warning" %}}
233233
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.
234234

235-
* **Port fix and reverting** – If you used [Port Fix](/refguide10/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.
235+
* **Cherry pick and reverting** – If you used [Cherry Pick](/refguide10/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.
236236
* **Merging and reverting** – If you [merged another branch](/refguide10/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.
237237
{{% /alert %}}
238238

@@ -311,7 +311,7 @@ If you have multiple development lines, you sometimes want to merge changes from
311311

312312
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.
313313

314-
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](/refguide10/merge-dialog/).
314+
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](/refguide10/merge-dialog/).
315315

316316
#### Replacing the Main Line with a Branch Line
317317

0 commit comments

Comments
 (0)