Resolve merge conflict

Signed-off-by: ziad hany <ziadhany2016@gmail.com>

Author: ziadhany

scanpipe/pipelines/analyze_symbols_reachability.py

@@ -97,10 +97,12 @@ def collect_and_match_resources(self):
 
     def generate_advisory_reachability_report(self):
         """Generate a reachability report summarizing status by advisory."""
-        reachability.generate_advisory_reachability_report(
-            project=self.project,
-            patches=self.patches,
-            candidate_resources=self.candidate_resources,
+        self.advisories_reachability_report = (
+            reachability.generate_advisory_reachability_report(
+                project=self.project,
+                patches=self.patches,
+                candidate_resources=self.candidate_resources,
+            )
         )
 
     def apply_reachability_to_packages_and_dependencies(self):
@@ -110,5 +112,5 @@ def apply_reachability_to_packages_and_dependencies(self):
         in their affected_by_vulnerabilities JSON field.
         """
         reachability.apply_reachability_to_packages_and_dependencies(
-            project=self.project, advisory_report=self.advisory_map
+            project=self.project, advisory_report=self.advisories_reachability_report
         )

scanpipe/pipes/reachability.py

@@ -27,6 +27,7 @@
 from enum import Enum
 from pathlib import Path
 
+from git import Repo
 from git.diff import NULL_TREE
 from typecode import get_type