From 19afb5b5789e00fad8cc510ec4be340d75e16dfb Mon Sep 17 00:00:00 2001 From: VaniHaripriya Date: Wed, 4 Dec 2024 14:07:53 -0600 Subject: [PATCH] Update rebase doc --- REBASE.opendatahub.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/REBASE.opendatahub.md b/REBASE.opendatahub.md index 6ea64c647f8..33842d21aa1 100644 --- a/REBASE.opendatahub.md +++ b/REBASE.opendatahub.md @@ -42,7 +42,7 @@ git merge opendatahub/master This action will need to resolve some conflicts manually. Some recommentations when working in this task are: -* Dockerfiles are not expected to have any merge conflicts. We should have our dsp images stored in a separate path from the kfp ones. +* Track upstream changes to Dockerfiles in the kubeflow/pipelines repository and update the corresponding DSP-related Dockerfiles in the /odh_images path to stay in sync with upstream changes. * Any changes in generated files (go.mod, go.sum, package.json, package-lock.json) should always prioritize upstream changes. * In case of changes in backend code that diverges completelly between kfp and dsp, you should use `git blame` to find the author(s) of the changes and work together to fix the conflicts. Do not try to fix by yourself, you are not alone in this.