fix: rebase and fixes

Signed-off-by: NucleoFusion <lakshit.singh.mail@gmail.com>

Author: NucleoFusion

cmd/harbor/root/tag/retention/create.go

@@ -84,12 +84,7 @@ A user can create up to 15 tag retention rules per project.`,
 				Algorithm: opts.Algorithm,
 			}
 
-			projectId, err := prompt.GetProjectIDFromUser()
-			if err != nil {
-				return err
-			}
-
-			err = createRetentionView(createView, int32(projectId))
+			err = createRetentionView(createView, projectIDorName, isName)
 			if err != nil {
 				log.Errorf("Failed to create tag retention rule: %v", err)
 			}

pkg/views/project/select/view.go

@@ -101,9 +101,6 @@ func ProjectListWithId(projects []*models.Project) (int64, error) {
 		}
 		return itemsMap[model.Choice], nil
 	}
-<<<<<<< HEAD
 
 	return 0, errors.New("unexpected program result")
-=======
->>>>>>> 7c61c8c (fix lint issues)
 }