Add logic for filtering collected changelog

eng/common/scripts/GeneralReleaseNotesLogic.ps1

@@ -66,3 +66,30 @@ function Parse-ReleaseHighlights ($content)
     }
     return $releaseHighlights
 }
+
+function Filter-ReleaseHighlights ($releaseHighlights)
+{
+    foreach ($key in $releaseHighlights.Keys)
+    {
+        $keyInfo = $key.Split(":")
+        $packageName = $keyInfo[0]
+        $packageVersion = $keyInfo[1]
+
+        $existingPackages = GetExistingPackageVersions -PackageName $packageName
+
+        if ()
+    }
+}
+
+function Write-GeneralReleaseNote ($releaseHighlights, $releaseFilePath)
+{
+    $releaseContent = Get-Content $releaseFilePath
+    $newReleaseContent = @()
+    $lineNumber = 0
+
+    while ($lineNumber -lt $releaseContent.Count)
+    {
+        $line = $releaseContent[$lineNumber]
+
+    }
+}

eng/common/scripts/Package-Properties.ps1

@@ -109,11 +109,7 @@ function Get-PkgProperties
             return $pkgProps
         }
     }
-<<<<<<< HEAD
     LogWarning "Failed to retrive Properties for $PackageName"
-=======
-    LogError "Failed to retrive Properties for $PackageName"
->>>>>>> Update Package-Properties.ps1
     return $null
 }
 

eng/common/scripts/Prepare-Release.ps1

@@ -105,4 +105,4 @@ if ($LASTEXITCODE -ne 0)
     git status
     Write-Host "Some changes were made to the repo source" -ForegroundColor Green
     Write-Host "Submit a pull request with the necessary changes to the repo" -ForegroundColor Green
-}
+}