Merge branch 'master' into amburns-vsmac-build

Author: timeyoutakeit

docs/ide/media/vside-refactoring-changebase1.png

@@ -1,22 +1,22 @@
 ---
 title: "Quick Actions | Microsoft Docs"
 ms.custom: ""
-ms.date: "03/10/2017"
+ms.date: "05/08/2017"
 ms.reviewer: ""
 ms.suite: ""
-ms.technology: 
+ms.technology:
     - "vs-ide-general"
 ms.tgt_pltfrm: ""
 ms.topic: "article"
 ms.devlang: csharp
 ms.assetid: e173fb7d-c5bd-4568-ba0f-aa61913b3244
-author: "BrianPeek"
-ms.author: "brpeek"
+author: "kempb"
+ms.author: "kempb"
 manager: "ghogen"
 dev_langs:
     - CSharp
     - VB
-translation.priority.ht: 
+translation.priority.ht:
     - "cs-cz"
     - "de-de"
     - "es-es"
@@ -100,7 +100,7 @@ switch(myEnum)
     case MyEnum.Item3:
         break;
     default:
-        break;	
+        break;
 }
 ```
 
@@ -308,7 +308,7 @@ Debug.WriteLine("Hello")
 ```
 
 ### Convert to Interpolated String
-[Interpolated strings](/dotnet/articles/csharp/language-reference/keywords/interpolated-strings) are an easy way to express strings with embedded variables, similar to the **[String.Format](https://msdn.microsoft.com/library/system.string.format(v=vs.110).aspx)** method.  This Quick Action will recognize cases where strings are concatenated, or using **String.Format**, and change the usage to an interpolated string.
+[Interpolated strings](/dotnet/articles/csharp/language-reference/keywords/interpolated-strings) are an easy way to express strings with embedded variables, similar to the **[String.Format](https://msdn.microsoft.com/library/system.string.format.aspx)** method.  This Quick Action recognizes cases where strings are concatenated, or using **String.Format**, and changes the usage to an interpolated string.
 
 ```CSharp
 // Before
@@ -334,5 +334,94 @@ Dim num as Integer = 3
 Dim s As String = $"My string with {num} in the middle"
 ```
 
+### Remove merge conflict markers
+These Quick Actions enable you to resolve merge conflicts by "taking a change", which removes the conflicting code and markers. (Available only in Visual Studio 2017 (version 15.3 - Preview).)
+
+![Refactoring - resolve merge conflicts](../ide/media/vside-refactoring-merge-conflicts.png)
+
+### Add null checks for parameters
+This Quick Action enables you to add a check in your code to tell whether a parameter is null. (Available only in Visual Studio 2017 (version 15.3 - Preview).)
+
+![Refactoring - add null check](../ide/media/vside-refactoring-nullcheck.png)
+
+### Constructor generator improvements
+When you're creating a constructor, this Quick Action enables you to select the properties or fields to generate, or you can generate the constructor from an empty body. You can also use it to add parameters to an existing constructor from the call-site. (Available only in Visual Studio 2017 (version 15.3 - Preview).)
+
+![Refactoring - generate constructors](../ide/media/vside-refactoring-constructors.png)
+
+### Remove unused variables
+This Quick Action enables you to remove variables that have been declared but never used in your code. (Available only in Visual Studio 2017 (version 15.3 - Preview).)
+
+![Refactoring - unused variables](../ide/media/vside-refactoring-unusedvars.png)
+
+### Generate overrides
+This Quick Action enables you to create an override from a blank line in a class or struct. The **Pick Members** dialog box lets you choose the members to override. (Available only in Visual Studio 2017 (version 15.3 - Preview).)
+
+![Refactoring - overrides](../ide/media/vside-refactoring-overrides.png)
+
+![Refactoring - overrides dialog box](../ide/media/vside-refactoring-overrides-dialog.png)
+
+### Change base for numeric literals
+This Quick Action enables you to convert a numeric literal from one base numeric system to another. For example, you can change a number to hexadecimal or to binary format. (Available only in Visual Studio 2017 (version 15.3 - Preview).)
+
+![Refactoring - change base](../ide/media/vside-refactoring-changebase1.png)
+
+![Refactoring - change base](../ide/media/vside-refactoring-changebase2.png)
+
+### Insert digit separators into literals
+This Quick Action enables you to add separator characters into literal values. (Available only in Visual Studio 2017 (version 15.3 - Preview).)
+
+![Refactoring - change digit separators](../ide/media/vside-refactoring-separators.png)
+
+### Convert **if** construct to **switch**
+This Quick Action enables you to convert an **if-then-else** construct to a **switch** construct. (Available only in Visual Studio 2017 (version 15.3 - Preview).)
+
+```CSharp
+// Before
+if (obj is string s)
+{
+  Console.WriteLine("obj is a string: " + s);  
+}
+
+else if (obj is int i && i > 10)
+{
+  Console.WriteLine("obj is an int greater than 10");
+}
+
+// Convert to switch
+
+// After
+switch (obj)
+{
+  case string s:
+    Console.WriteLine("Obj is a string: " + s);
+    break;
+  case int i when i > 10:
+    Console.WriteLine("obj is an int greater than 10");
+    break;
+}
+```
+
+```VB
+' Before
+If TypeOf obj Is String s Then
+    Console.WriteLine("obj is a string: " + s)
+Else If TypeOf obj Is Integer i And i > 10 Then
+    Console.WriteLine("obj is an int greater than 10")
+End If
+
+' Convert to switch
+
+' After
+Select Case obj
+  Case String s
+    Console.WriteLine("Obj is a string: " + s)
+    Exit Sub
+  Case Integer i when i > 10
+    Console.WriteLine("obj is an int greater than 10")
+    Exit Sub
+End Select
+```
+
 # See Also
-* [Code Styles and Quick Actions](code-styles-and-quick-actions.md)
+* [Code Styles and Quick Actions](code-styles-and-quick-actions.md)