fix(lint): resolve CI lint failures for v0.47.0 release

- resolve_conflicts.go: Mark unused `num` parameter with `_`
- .golangci.yml: Add resolve_conflicts.go to G306 exclusion (JSONL files use 0644)
- .golangci.yml: Add doctor/git.go to G304 exclusion (safe path construction)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

cmd/bd/resolve_conflicts.go

@@ -283,7 +283,7 @@ func parseConflicts(content string) ([]conflictRegion, []string, error) {
 }
 
 // resolveConflict resolves a single conflict region using merge semantics
-func resolveConflict(conflict conflictRegion, num int) ([]string, conflictResolutionInfo) {
+func resolveConflict(conflict conflictRegion, _ int) ([]string, conflictResolutionInfo) {
 	info := conflictResolutionInfo{
 		LineRange:  fmt.Sprintf("%d-%d", conflict.StartLine, conflict.EndLine),
 		LeftLabel:  conflict.LeftLabel,