You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
sorenlouv/backport#206 added support for automatic conflict resolution logic in the backport script, which we should try to take advantage of.
Ideally this could be applied via the Github Action at some point, but for now I think it's reasonable to just focus on handling these cases when running backports locally where failures can be debugged easier with access to the filesystem.
My initial plan is to implement resolution for two types of conflicts:
yarn.lock run BUILD_TS_REFS_DISABLE=true yarn kbn bootstrap
api_docs/**/* run node scripts/build_api_docs
The text was updated successfully, but these errors were encountered:
sorenlouv/backport#206 added support for automatic conflict resolution logic in the backport script, which we should try to take advantage of.
Ideally this could be applied via the Github Action at some point, but for now I think it's reasonable to just focus on handling these cases when running backports locally where failures can be debugged easier with access to the filesystem.
My initial plan is to implement resolution for two types of conflicts:
yarn.lock
runBUILD_TS_REFS_DISABLE=true yarn kbn bootstrap
api_docs/**/*
runnode scripts/build_api_docs
The text was updated successfully, but these errors were encountered: