You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: content/en/docs/refguide/modeling/menus/version-control-menu/merge-dialog.md
-2Lines changed: 0 additions & 2 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -11,7 +11,6 @@ With the **Merge** dialog you can [merge](/refguide/version-control/#merge) chan
11
11
{{% alert color="warning" %}}
12
12
Before continuing with the merge action, make sure you are currently working in the development line to which you want to merge.
13
13
{{% /alert %}}
14
-
{{% /alert %}}
15
14
16
15
To access the **Merge** dialog box, open [Version Control](/refguide/version-control-menu/) > **Merge Changes Here**:
17
16
@@ -27,7 +26,6 @@ This functionality was known as **Port fix** in previous versions of Studio Pro.
27
26
28
27
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.
29
28
30
-
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.
31
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.
Copy file name to clipboardExpand all lines: content/en/docs/refguide10/modeling/menus/version-control-menu/merge-dialog.md
+7-3Lines changed: 7 additions & 3 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -18,19 +18,23 @@ To access the **Merge** dialog box, open [Version Control](/refguide10/version-c
18
18
19
19
Available scenarios are described in sections below.
20
20
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 %}}
22
26
23
27
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.
24
28
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.
26
30
27
31
### Branch Line
28
32
29
33
Choose the branch line from which you want to merge the fix.
30
34
31
35
### Revision
32
36
33
-
Choose a revision that you would like to port fix.
37
+
Choose a revision that you would like to cherry pick.
0 commit comments