Formatting and merge conflicts

Author: bergundy

temporalcli/commands.activity.go

@@ -376,6 +376,8 @@ func (c *TemporalActivityResetCommand) run(cctx *CommandContext, args []string)
 			request.Activity = &workflowservice.ResetActivityRequest_Type{Type: c.ActivityType}
 		} else if c.ActivityId != "" {
 			request.Activity = &workflowservice.ResetActivityRequest_Id{Id: c.ActivityId}
+		} else {
+			return fmt.Errorf("either Activity Type or Activity Id must be provided")
 		}
 
 		resp, err := cl.WorkflowService().ResetActivity(cctx, request)

temporalcli/commandsgen/commands.yml

@@ -337,8 +337,7 @@ commands:
     summary: Update Activity options
     description: |
       Update the options of a running Activity that were passed into it from
-      a Workflow. Updates are incremental, only changing the specified 
-      options.
+      a Workflow. Updates are incremental, only changing the specified options.
 
       For example:
 
@@ -370,7 +369,6 @@ commands:
           ...
       ```
     options:
-      
       - name: activity-id
         short: a
         type: string
@@ -541,8 +539,7 @@ commands:
       - name: match-all
         type: bool
         description: |
-          Every paused activity should be unpaused. This flag is ignored if
-          activity-type is provided. 
+          Every paused activity should be unpaused. This flag is ignored if activity-type is provided.
       - name: jitter
         type: duration
         description: |