conflicts

Author: bewithgaurav

CONTRIBUTING.md

@@ -11,7 +11,6 @@ instructions provided by the bot. You will only need to do this once across all
 
 This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
 For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/)
-<<<<<<< HEAD
 or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
 
 ## Before Contributing
@@ -41,6 +40,4 @@ All pull requests must include:
 - **Issue/Work Item Link** (only one required): 
   - External contributors: Link to a GitHub issue
   - Microsoft org members: Link to an ADO work item
-=======
 or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
->>>>>>> 06397346bcf475452f4047122b3367d63fbebecd

eng/pipelines/build-whl-pipeline.yml

@@ -157,13 +157,8 @@ jobs:
     # Copy the built .pdb files to staging folder for artifacts
     - task: CopyFiles@2
       inputs:
-<<<<<<< HEAD
         SourceFolder: '$(Build.SourcesDirectory)\mssql_python'
         Contents: 'ddbc_bindings.cp$(shortPyVer)-*.pdb'
-=======
-        SourceFolder: '$(Build.SourcesDirectory)\mssql_python\pybind\build\$(targetArch)\py$(shortPyVer)\Release'
-        Contents: 'ddbc_bindings.cp$(shortPyVer)-*.pdbs'
->>>>>>> 06397346bcf475452f4047122b3367d63fbebecd
         TargetFolder: '$(Build.ArtifactStagingDirectory)\all-pdbs'
       displayName: 'Place PDB file into artifacts directory'
 
@@ -192,7 +187,6 @@ jobs:
         publishLocation: 'Container'
       displayName: 'Publish all PYDs as artifacts'
 
-<<<<<<< HEAD
     # Publish the collected .pdb file(s) as build artifacts
     - task: PublishBuildArtifacts@1
       condition: succeededOrFailed()
@@ -202,8 +196,6 @@ jobs:
         publishLocation: 'Container'
       displayName: 'Publish all PDBs as build artifacts'
 
-=======
->>>>>>> 06397346bcf475452f4047122b3367d63fbebecd
     # Publish the python arm64 libraries as build artifacts for next builds if ARM64
     # We publish them only for ARM64 builds since we cannot install arm64 Python on x64 host
     # This allows us to reuse the libraries in future ARM64 builds
@@ -215,11 +207,7 @@ jobs:
         ArtifactName: 'mssql-python-arm64-libs'
         publishLocation: 'Container'
       displayName: 'Publish arm64 libs as artifacts'
-<<<<<<< HEAD
 
-=======
-    
->>>>>>> 06397346bcf475452f4047122b3367d63fbebecd
     # Publish the collected wheel file(s) as build artifacts
     - task: PublishBuildArtifacts@1
       condition: succeededOrFailed()

eng/pipelines/dummy-release-pipeline.yml

@@ -1,15 +1,10 @@
-<<<<<<< HEAD
 trigger: none
 
 name: mssql-python-dummy-release-pipeline
-=======
-name: mssql-python-official-release-pipeline
->>>>>>> 06397346bcf475452f4047122b3367d63fbebecd
 
 variables:
   - group: 'ESRP Federated Creds (AME)'
 
-<<<<<<< HEAD
 extends:
   template: v2/OneBranch.Official.CrossPlat.yml@templates
   parameters:
@@ -195,51 +190,3 @@ extends:
 #       ServiceEndpointUrl: 'https://api.esrp.microsoft.com'
 #       MainPublisher: 'ESRPRELPACMAN'
 #       DomainTenantId: '$(DomainTenantId)'
-=======
-jobs:
-- job: ReleaseESRPPackage
-  displayName: 'Release ESRP Package'
-  pool:
-    vmImage: 'windows-latest'
-  
-  steps:
-  - task: DownloadPipelineArtifact@2
-    inputs:
-      buildType: 'specific'
-      project: '$(System.TeamProject)'
-      definition: 2162
-      buildVersionToDownload: 'latest'
-      branchName: '$(Build.SourceBranch)'
-      artifactName: 'mssql-python-wheels-dist'
-      targetPath: '$(Build.SourcesDirectory)\dist'
-    displayName: 'Download release wheel files artifact from latest successful run on main branch'
-
-  # Show content of the downloaded artifact
-  - script: |
-      echo "Contents of the dist directory:"
-      dir "$(Build.SourcesDirectory)\dist"
-    displayName: 'List contents of dist directory'
-
-  - task: EsrpRelease@9
-    displayName: 'ESRP Release'
-    inputs:
-      connectedservicename: '$(ESRPConnectedServiceName)'
-      usemanagedidentity: true
-      keyvaultname: '$(AuthAKVName)'
-      signcertname: '$(AuthSignCertName)'
-      clientid: '$(EsrpClientId)'
-      Intent: 'PackageDistribution'
-      # Changing content type to Maven release (NOT PyPI) since we want to do dummy release
-      # for ESRP testing purposes, not for actual PyPI distribution.
-      # This is a workaround to allow ESRP to process the release without actual PyPI content
-      # and to avoid ESRP validation errors.
-      ContentType: 'Maven'
-      ContentSource: 'Folder'
-      FolderLocation: '$(Build.SourcesDirectory)/dist'
-      WaitForReleaseCompletion: true
-      Owners: '$(owner)'
-      Approvers: '$(approver)'
-      ServiceEndpointUrl: 'https://api.esrp.microsoft.com'
-      MainPublisher: 'ESRPRELPACMAN'
-      DomainTenantId: '$(DomainTenantId)'
->>>>>>> 06397346bcf475452f4047122b3367d63fbebecd