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

Enable continue on error for our mirror steps #7430

Merged
merged 1 commit into from
Dec 11, 2023
Merged

Enable continue on error for our mirror steps #7430

merged 1 commit into from
Dec 11, 2023

Conversation

weshaggard
Copy link
Member

@weshaggard weshaggard commented Dec 11, 2023 •
edited by konrad-jamrozik
Loading

  • Enable continueonerror for our mirroring steps so one bad repo doesn't stop the others from mirroring
  • React to recent change to git cli git/git@54f98fe Instead of passing --theirs we can get away with --ignore-unmerged given we are trying to avoid any merge conflicts at all and want to simply pick and choose which files we want to include from which branches

@weshaggard
Enable continue on error for our mirror steps
010e9d3 
- Enable continueonerror for our mirroring steps so one bad
  repo doesn't stop the others from mirroring
- React to recent change to git cli git/git@54f98fe
  Instead of passing --theirs we can get away with --ignore-unmerged given
  we are tryig to avoid any merge conflicts at all and want to simply pick
  and choose which files we want to include from which branches
@weshaggard weshaggard requested a review from a team as a code owner December 11, 2023 19:12
@weshaggard weshaggard merged commit b842845 into Azure:main Dec 11, 2023
16 checks passed
@weshaggard weshaggard deleted the FixMergeScript branch December 11, 2023 19:43
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

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

Successfully merging this pull request may close these issues.
2 participants
@weshaggard @benbp