Two fixes

Author: stuartpa

cmd/modern/root/config/add-context.go

@@ -26,7 +26,9 @@ func (c *AddContext) DefineCommand(...cmdparser.CommandOptions) {
 		Examples: []cmdparser.ExampleOptions{
 			{
 				Description: "Add a default context",
-				Steps:       []string{"sqlcmd config add-context --name my-context"}},
+				Steps: []string{
+					"sqlcmd config add-endpoint --name localhost-1433",
+					"sqlcmd config add-context --name my-context --endpoint localhost-1433"}},
 		},
 		Run: c.run}
 

internal/config/context.go

@@ -18,7 +18,16 @@ func AddContext(context Context) {
 	if !EndpointExists(context.Endpoint) {
 		panic("Endpoint doesn't exist")
 	}
+<<<<<<< Updated upstream
 	context.Name = FindUniqueContextName(context.Name, *context.User)
+=======
+	username := ""
+	if context.User != nil && *context.User != "" {
+		username = *context.User
+	}
+
+	context.Name = FindUniqueContextName(context.Name, username)
+>>>>>>> Stashed changes
 	config.Contexts = append(config.Contexts, context)
 	Save()
 }