Skip to content
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

Jump to bottom

auto-merge conflicted assets.json #7537

Merged
merged 10 commits into from
Jan 17, 2024
Merged

auto-merge conflicted assets.json #7537

merged 10 commits into from
Jan 17, 2024

Conversation

scbedd
Copy link
Member

@scbedd scbedd commented Jan 16, 2024 •
edited
Loading

Includes:

  • extension to git-helpers.ps1 which allows access to "left" and "right" side versions of a conflicted file.
  • Script that automerges a conflicted assets.json file's tags from the "left" and "right" side of the merge

@azure-sdk
Copy link
Collaborator

The following pipelines have been queued for testing:
java - template
java - template - tests
js - template
net - template
net - template - tests
python - template
python - template - tests
You can sign off on the approval gate to test the release stage of each pipeline.
See eng/common workflow

@azure-sdk
Copy link
Collaborator

The following pipelines have been queued for testing:
java - template
java - template - tests
js - template
net - template
net - template - tests
python - template
python - template - tests
You can sign off on the approval gate to test the release stage of each pipeline.
See eng/common workflow

@scbedd scbedd self-assigned this Jan 17, 2024
@scbedd scbedd marked this pull request as ready for review January 17, 2024 01:06
@azure-sdk
Copy link
Collaborator

The following pipelines have been queued for testing:
java - template
java - template - tests
js - template
net - template
net - template - tests
python - template
python - template - tests
You can sign off on the approval gate to test the release stage of each pipeline.
See eng/common workflow

@azure-sdk
Copy link
Collaborator

The following pipelines have been queued for testing:
java - template
java - template - tests
js - template
net - template
net - template - tests
python - template
python - template - tests
You can sign off on the approval gate to test the release stage of each pipeline.
See eng/common workflow

@benbp
Copy link
Member

benbp commented Jan 17, 2024

+1 w/ the acknowledgement that powershell classes are a PITA as we experienced last night.

@scbedd @benbp
Update eng/common/scripts/Helpers/git-helpers.ps1
845b9c6 
Co-authored-by: Ben Broderick Phillips <bebroder@microsoft.com>
@azure-sdk
Copy link
Collaborator

The following pipelines have been queued for testing:
java - template
java - template - tests
js - template
net - template
net - template - tests
python - template
python - template - tests
You can sign off on the approval gate to test the release stage of each pipeline.
See eng/common workflow

This was referenced Jan 17, 2024
Merged
Merged
Merged
Merged
Merged
Merged
This was referenced Jan 17, 2024
Merged
Merged
Merged
@scbedd scbedd merged commit 1a4819d into main Jan 17, 2024
11 checks passed
@scbedd scbedd deleted the autoresolve-asset-conflict branch January 17, 2024 22:14
@scbedd scbedd mentioned this pull request Jan 17, 2024
Closed
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@benbp benbp benbp approved these changes

@konrad-jamrozik konrad-jamrozik Awaiting requested review from konrad-jamrozik

@weshaggard weshaggard Awaiting requested review from weshaggard

Assignees

@scbedd scbedd

Labels
None yet
Projects
Azure SDK EngSys 🤖🧠
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@scbedd @azure-sdk @benbp