Skip to content

Commit d7c59fc

Browse files
Merge pull request #9391 from mikita-haurykau/solp/2255-rename-port-fix
[SOLP-3215] Rename Port fix to Cherry pick
2 parents 901e697 + 0310da4 commit d7c59fc

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Available scenarios are described in sections below.
2121
## Cherry Pick
2222

2323
{{% alert color="info" %}}
24-
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 for the operation.
24+
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.
2525
{{% /alert %}}
2626

2727
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.

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,23 @@ To access the **Merge** dialog box, open [Version Control](/refguide10/version-c
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 Studio Pro. It has been renamed to **Cherry pick** to keep it more consistent with the native Git name.
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 transports the actual commit from one branch and directly applies it, including author and commit text to another branch. This means you do not need to explicitly commit your change.
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

2933
Choose the branch line from which you want to merge the fix.
3034

3135
### Revision
3236

33-
Choose a revision that you would like to port fix.
37+
Choose a revision that you would like to cherry pick.
3438

3539
## Merge Feature Branch
3640

Loading

0 commit comments

Comments
 (0)