resolved conflicts

.github/workflows/build.yaml

@@ -1,26 +1,23 @@
 name: Go Build and Test
 
 on:
-  pull_request_target:
-    types: [opened,synchronize]
+  pull_request
 
 jobs:
-  build:
 
+  build-and-test:
+    name: Build and Test the Go code
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-
+      - name: Checkout the code
+        uses: actions/checkout@v4
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: '1.22'
-
+          go-version: '1.22.5'
       - name: make verification
         run: make verifiers
-
       - name: Build
         run: go build -v ./...
-
       - name: Test
         run: go test -v ./...

.golangci.yml

@@ -32,6 +32,3 @@ issues:
     - should have comment or be unexported
     - time-naming
     - error strings should not be capitalized or end with punctuation or a newline
-
-service:
-  golangci-lint-version: 1.43.0 # use the fixed version to not introduce new linters unexpectedly

cmd/query.go

@@ -45,11 +45,14 @@ var (
 	saveFilterFlag  = "save-as"
 	saveFilterShort = "s"
 	// save filter with time flags
+	// save filter with time flags
 	saveFilterTimeFlag  = "with-time"
 	saveFilterTimeShort = "w"
 
 	// interactiveFlag      = "interactive"
 	// interactiveFlagShort = "i"
+	// interactiveFlag      = "interactive"
+	// interactiveFlagShort = "i"
 )
 
 var query = &cobra.Command{