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/version-control/using-version-control-in-studio-pro/merge-algorithm.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
@@ -312,8 +312,6 @@ The **Show file conflicts** button is shown when there are conflicts in files wh
312
312
313
313
When clicked, it opens up a pop-up window with a list of all the files that are affected by the update process, with conflicted ones at the top of the list.
314
314
315
-
You can also use the [Show Changes on Disk](/refguide/version-control-menu/#show-changes) menu item instead.
316
-
317
315
### Rebase-Specific Controls
318
316
319
317
There are some buttons which are only shown when conflicts are found when doing a rebase.
Copy file name to clipboardExpand all lines: content/en/docs/releasenotes/studio-pro/10/10.6.md
+2-2Lines changed: 2 additions & 2 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -49,7 +49,7 @@ This is the [MTS](/releasenotes/studio-pro/lts-mts/#mts) version 10 release for
49
49
* Fixed in [10.21.0](/releasenotes/studio-pro/10.21/#fix-workflow-instances).
50
50
* There is a positioning error in the logic editors when you are dragging a large element, such as a loop, into a sequence flow, it overlaps with the existing elements.
51
51
* Fixed in [10.12.12](/releasenotes/studio-pro/10.12/#fix-positioning-error) and in [10.14.0](/releasenotes/studio-pro/10.14/#fix-positioning-error).
52
-
* Line endings in CSS files are not being handled properly, so when using [Revert All Changes](/refguide/using-version-control-in-studio-pro/) or performing other version-control operations, CSS files appear in the [Changes on Disk](/refguide/version-control-menu/#show-changes) dialog box.
52
+
* Line endings in CSS files are not being handled properly, so when using [Revert All Changes](/refguide/using-version-control-in-studio-pro/) or performing other version-control operations, CSS files appear in the **Changes on Disk** dialog box.
53
53
* Fixed in [10.18.0](/releasenotes/studio-pro/10.18/#fix-line-endings).
54
54
55
55
## 10.6.23 {#10623}
@@ -73,7 +73,7 @@ This is the [MTS](/releasenotes/studio-pro/lts-mts/#mts) version 10 release for
73
73
* Fixed in [10.21.0](/releasenotes/studio-pro/10.21/#fix-workflow-instances).
74
74
* There is a positioning error in the logic editors when you are dragging a large element, such as a loop, into a sequence flow, it overlaps with the existing elements.
75
75
* Fixed in [10.12.12](/releasenotes/studio-pro/10.12/#fix-positioning-error) and in [10.14.0](/releasenotes/studio-pro/10.14/#fix-positioning-error).
76
-
* Line endings in CSS files are not being handled properly, so when using [Revert All Changes](/refguide/using-version-control-in-studio-pro/) or performing other version-control operations, CSS files appear in the [Changes on Disk](/refguide/version-control-menu/#show-changes) dialog box.
76
+
* Line endings in CSS files are not being handled properly, so when using [Revert All Changes](/refguide/using-version-control-in-studio-pro/) or performing other version-control operations, CSS files appear in the **Changes on Disk** dialog box.
77
77
* Fixed in [10.18.0](/releasenotes/studio-pro/10.18/#fix-line-endings).
0 commit comments