Skip to content

Commit 2e209d9

Browse files
Rename port fix to Cherry-pick
1 parent 8d7b39c commit 2e209d9

2 files changed

Lines changed: 7 additions & 3 deletions

File tree

  • content/en/docs/refguide/modeling/menus/version-control-menu
  • static/attachments/refguide/modeling/menus/version-control-menu/merge-dialog

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,23 @@ With the **Merge** dialog you can [merge](/refguide/version-control/#merge) chan
1010

1111
{{% alert color="warning" %}}
1212
Before continuing with the merge action, make sure you are currently working in the development line to which you want to merge.
13-
{{% /alert %}}
13+
{{% /alert %}}
1414

1515
To access the **Merge** dialog box, open [Version Control](/refguide/version-control-menu/) > **Merge Changes Here**:
1616

1717
{{< figure src="/attachments/refguide/modeling/menus/version-control-menu/merge-dialog/merge-dialog.png" alt="Merge Dialog" class="no-border" >}}
1818

1919
Available scenarios are described in sections below.
2020

21-
## Port Fix
21+
## Cherry Pick
22+
23+
{{% alert color="info" %}}
24+
This functionality was known as "Port Fix" in previous versions of StudioPro. It has been renamed to "Cherry Pick" to keep it more consistent with the native Git name for the operation.
25+
{{% /alert %}}
2226

2327
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.
2428

25-
Port fix adds changes from the selected commit to your branch line. You will need to explicitly commit these changes after performing the port fix.
29+
Cherry pick adds changes from the selected commit to your branch line. You will need to explicitly commit these changes after performing the cherry pick.
2630

2731
### Branch Line
2832

6.8 KB
Loading

0 commit comments

Comments
 (0)