Skip to content

chore: enable merge flag for generated bindings #10082

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.

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
merged 1 commit into from
Nov 13, 2024

Conversation

hamidzr
Copy link
Contributor

@hamidzr hamidzr commented Oct 18, 2024

Ticket

Description

I think I shouldn't have disabled merge on these. https://github.com/determined-ai/redacted/pull/262#issue-2566638197

have you seen your PRs getting blocked by: "merge conflict on openapi31.json" files? with the flag we have in git attributes and how it's a single line we've disabled git from automatically attempting to merge these files this changes that

reduce git merge conflicts by remove the -merge flag and saving the oapi spec as multiline text file.
https://git-scm.com/docs/gitattributes

Test Plan

Checklist

  • Changes have been manually QA'd
  • New features have been approved by the corresponding PM
  • User-facing API changes have the "User-facing API Change" label
  • Release notes have been added as a separate file under docs/release-notes/
    See Release Note for details.
  • Licenses have been included for new code which was copied and/or modified from any external code

@cla-bot cla-bot bot added the cla-signed label Oct 18, 2024
Copy link

netlify bot commented Oct 18, 2024

Deploy Preview for determined-ui canceled.

Name Link
🔨 Latest commit 45768dc
🔍 Latest deploy log https://app.netlify.com/sites/determined-ui/deploys/6712b07f04d21100086754ac

Copy link

codecov bot commented Oct 18, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 54.39%. Comparing base (bdb56a4) to head (45768dc).
Report is 82 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main   #10082      +/-   ##
==========================================
- Coverage   54.40%   54.39%   -0.01%     
==========================================
  Files        1267     1267              
  Lines      159321   159321              
  Branches     3632     3632              
==========================================
- Hits        86680    86670      -10     
- Misses      72507    72517      +10     
  Partials      134      134              
Flag Coverage Δ
backend 45.56% <ø> (-0.02%) ⬇️
harness 72.55% <ø> (ø)
web 53.94% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

see 4 files with indirect coverage changes

@hamidzr hamidzr marked this pull request as ready for review October 22, 2024 15:47
@hamidzr hamidzr changed the title chore: re-enable merge flag for generated bindings chore: enable merge flag for generated bindings Oct 22, 2024
@hamidzr hamidzr merged commit 67a168a into main Nov 13, 2024
88 of 100 checks passed
@hamidzr hamidzr deleted the hz-enable-merge-forgenerated branch November 13, 2024 23:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants