Skip to content

FIX: Updating sync pipeline to resolve merge issues between ado and github #373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gargsaumya merged 3 commits into from
Dec 16, 2025
Merged

FIX: Updating sync pipeline to resolve merge issues between ado and github #373

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88c9d7b
simplified to resolve merge issues between ado and github
gargsaumya Dec 15, 2025
8191007
updating
gargsaumya Dec 16, 2025
fb6f338
Merge branch 'main' into saumya/sync
gargsaumya Dec 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 42 additions & 31 deletions OneBranchPipelines/github-ado-sync.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# GitHub-to-ADO Sync Pipeline
# Syncs main branch from public GitHub to internal Azure DevOps daily at 5pm IST
#
# SYNC STRATEGY RATIONALE:
# This pipeline uses a "replace-all" approach rather than traditional git merge/rebase because:
# 1. DIVERGENT HISTORY: ADO repository contains commits from early development that don't exist
# in GitHub. These historical commits were made before GitHub became the source of truth.
# 2. AVOIDING CONFLICTS: Standard git operations (merge, rebase, reset --hard) fail when
# repositories have divergent commit histories. Attempting to merge results in conflicts
# that cannot be automatically resolved.
# 3. IMPLEMENTATION: We use 'git fetch + git rm + git checkout' to completely replace ADO's
# working tree with GitHub's files without attempting to reconcile git history. This creates
# a clean sync commit that updates all files to match GitHub exactly.
# 4. CHANGE DETECTION: The pipeline checks if any files actually differ before creating PRs,
# avoiding unnecessary sync operations when repositories are already aligned.

name: GitHub-Sync-$(Date:yyyyMMdd)$(Rev:.r)

Expand All @@ -21,25 +34,15 @@ jobs:
vmImage: 'windows-latest'

steps:
- checkout: none
- checkout: self
persistCredentials: true

- task: CmdLine@2
displayName: 'Clone GitHub repo'
displayName: 'Add GitHub remote'
inputs:
script: git clone https://github.com/microsoft/mssql-python.git repo-dir -b main
workingDirectory: $(Agent.TempDirectory)

- task: CmdLine@2
displayName: 'Add Azure DevOps remote'
inputs:
script: git remote add azdo-mirror https://$(System.AccessToken)@sqlclientdrivers.visualstudio.com/mssql-python/_git/mssql-python
workingDirectory: $(Agent.TempDirectory)/repo-dir

- task: CmdLine@2
displayName: 'Fetch ADO repo'
inputs:
script: git fetch azdo-mirror
workingDirectory: $(Agent.TempDirectory)/repo-dir
script: |
git remote add github https://github.com/microsoft/mssql-python.git
git fetch github main

- task: CmdLine@2
displayName: 'Create timestamped sync branch'
Expand All @@ -51,26 +54,35 @@ jobs:
set SYNC_BRANCH=github-sync-%TIMESTAMP%
echo %SYNC_BRANCH% > branchname.txt
echo Creating sync branch: %SYNC_BRANCH%
git fetch azdo-mirror
git show-ref --verify --quiet refs/remotes/azdo-mirror/main
if %ERRORLEVEL% EQU 0 (
git checkout -b %SYNC_BRANCH% -t azdo-mirror/main
) else (
echo azdo-mirror/main does not exist. Exiting.
exit /b 1
)
git checkout -b %SYNC_BRANCH%
echo ##vso[task.setvariable variable=SYNC_BRANCH;isOutput=true]%SYNC_BRANCH%
workingDirectory: $(Agent.TempDirectory)/repo-dir

- task: CmdLine@2
displayName: 'Reset branch to match GitHub main exactly'
displayName: 'Sync with GitHub main'
inputs:
script: |
git -c user.email="[email protected]" -c user.name="ADO Sync Bot" reset --hard origin/main
workingDirectory: $(Agent.TempDirectory)/repo-dir
echo Syncing with GitHub main...
git config user.email "[email protected]"
git config user.name "ADO Sync Bot"

git fetch github main
git rm -rf .
git checkout github/main -- .
echo timestamp.txt >> .git\info\exclude
echo branchname.txt >> .git\info\exclude
git diff --cached --quiet
if %ERRORLEVEL% EQU 0 (
echo No changes detected. Skipping commit.
echo ##vso[task.setvariable variable=HAS_CHANGES]false
) else (
echo Changes detected. Creating commit...
git add . && git commit -m "Sync from GitHub main"
echo ##vso[task.setvariable variable=HAS_CHANGES]true
)

- task: CmdLine@2
displayName: 'Push branch to Azure DevOps'
condition: eq(variables['HAS_CHANGES'], 'true')
inputs:
script: |
set /p SYNC_BRANCH=<branchname.txt
Expand All @@ -79,18 +91,18 @@ jobs:
git config user.email "[email protected]"
git config user.name "ADO Sync Bot"

git push azdo-mirror %SYNC_BRANCH% --set-upstream
git push origin %SYNC_BRANCH% --set-upstream

if %ERRORLEVEL% EQU 0 (
echo Branch pushed successfully!
) else (
echo ERROR: Push failed!
exit /b 1
)
workingDirectory: $(Agent.TempDirectory)/repo-dir

- task: CmdLine@2
displayName: 'Create pull request'
condition: eq(variables['HAS_CHANGES'], 'true')
inputs:
script: |
echo Installing Azure DevOps extension...
Expand Down Expand Up @@ -124,4 +136,3 @@ jobs:

if exist timestamp.txt del timestamp.txt
if exist branchname.txt del branchname.txt
workingDirectory: $(Agent.TempDirectory)/repo-dir
Loading