Add instructions to rebase from upstream

README.md

@@ -1,27 +1,9 @@
-<img src="https://www.kubeflow.org/images/logo.svg" width="100">
-Kubeflow the cloud-native platform for machine learning operations - pipelines, training and deployment.
+# ODH Kubeflow
 
----
+This repository is forked from the [Kubeflow upstream
+repository](https://github.com/kubeflow/kubeflow).
 
-## Documentation
-Please refer to the official docs at [kubeflow.org](http://kubeflow.org).
-
-## Working Groups
-The Kubeflow community is organized into working groups (WGs) with associated repositories, that focus on specific pieces of the ML platform. 
-
-* [AutoML](https://github.com/kubeflow/community/tree/master/wg-automl)
-* [Deployment](https://github.com/kubeflow/community/tree/master/wg-deployment)
-* [Manifests](https://github.com/kubeflow/community/tree/master/wg-manifests)
-* [Notebooks](https://github.com/kubeflow/community/tree/master/wg-notebooks)
-* [Pipelines](https://github.com/kubeflow/community/tree/master/wg-pipelines)
-* [Serving](https://github.com/kubeflow/community/tree/master/wg-serving)
-* [Training](https://github.com/kubeflow/community/tree/master/wg-training)
-
-## Quick Links
-* [Prow jobs dashboard](http://prow.kubeflow-testing.com)
-* [PR Dashboard](https://k8s-gubernator.appspot.com/pr)
-* [Argo UI for E2E tests](https://argo.kubeflow-testing.com)
-
-## Get Involved
-Please refer to the [Community](https://www.kubeflow.org/docs/about/community/) page.
+## Rebase
 
+Follow the instructions in the [REBASE.md](./REBASE.md) file to understand how
+to rebase this repository without conflicts.

REBASE.md

@@ -0,0 +1,28 @@
+# Rebasing upstream
+
+Configure the Kubeflow repository as the remote upstream:
+
+```shell
+git remote add upstream [email protected]:kubeflow/kubeflow.git
+git remote set-url --push upstream DISABLE
+```
+
+Fetch the latest changes in the Kubeflow repository:
+
+```shell
+git fetch upstream -p
+```
+
+Rebase and favor local changes upon conflicts:
+
+```shell
+git rebase -Xtheirs upstream/main
+```
+
+*The above may cause conflicts. Learn how to fix these conflicts by reading the official [git-scm docs](https://git-scm.com/docs/git-rebase).*
+
+Finally, push these changes to the ODH repository:
+
+```shell
+git push origin --force
+```