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

Teach rebuild Action how to resolve conflicts in lib #2140

Merged
merged 1 commit into from
Feb 14, 2024
Merged

Teach rebuild Action how to resolve conflicts in lib #2140

merged 1 commit into from
Feb 14, 2024

Conversation

henrymercer
Copy link
Contributor

This should reduce a common source of friction when we have two PRs in flight that touch the same file.

Merge / deployment checklist

  • Confirm this change is backwards compatible with existing workflows.
  • Confirm the readme has been updated if necessary.
  • Confirm the changelog has been updated if necessary.

@henrymercer henrymercer requested a review from a team as a code owner February 14, 2024 15:27
aeisenberg
aeisenberg approved these changes Feb 14, 2024
View reviewed changes
Copy link
Contributor

@aeisenberg aeisenberg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

Unrelated: We should start putting permissions blocks in our workflow files.

@henrymercer henrymercer merged commit d57cf8e into main Feb 14, 2024
295 checks passed
@henrymercer henrymercer deleted the henrymercer/rebuild-resolve-conflicts branch February 14, 2024 15:45
@github-actions github-actions bot mentioned this pull request Feb 15, 2024
Merged
8 tasks
@henrymercer henrymercer mentioned this pull request Feb 15, 2024
Merged
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aeisenberg aeisenberg aeisenberg approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@henrymercer @aeisenberg