Account for conflict format in command

Author: bluekeyes

applier.go

@@ -360,7 +360,7 @@ func base64Apply(data []byte, name string, f *gitdiff.File) (string, error) {
 	return b.String(), nil
 }
 
-// apply runs gitdiff.Apply, wrapping any conflicts  in patch2pr's Conflict type.
+// apply runs gitdiff.Apply, wrapping any conflicts in patch2pr's Conflict type.
 func apply(dst io.Writer, src io.ReaderAt, name string, f *gitdiff.File) error {
 	if err := gitdiff.Apply(dst, src, f); err != nil {
 		var applyErr *gitdiff.ApplyError

cmd/patch2pr/main.go

@@ -249,11 +249,15 @@ func execute(ctx context.Context, client *github.Client, patchFiles []string, op
 	for _, patch := range allPatches {
 		for _, file := range patch.files {
 			if _, err := applier.Apply(ctx, file); err != nil {
-				name := file.NewName
-				if name == "" {
-					name = file.OldName
+				var namePart string
+				if !errors.Is(err, &patch2pr.Conflict{}) {
+					name := file.NewName
+					if name == "" {
+						name = file.OldName
+					}
+					namePart = name + ": "
 				}
-				return nil, fmt.Errorf("apply failed: %s: %w", name, err)
+				return nil, fmt.Errorf("apply failed: %s%w", namePart, err)
 			}
 		}