forked from kubeflow/kubeflow
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update rebase docs with wei/pull app (kubeflow#10)
- Loading branch information
Showing
1 changed file
with
18 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,32 @@ | ||
| # Rebasing upstream | ||
|
|
||
| Configure the Kubeflow repository as the remote upstream: | ||
| The [**Pull GitHub App**](https://github.com/wei/pull) has been configured to | ||
| automatically update the ODH Kubeflow fork with last changes from upstream. | ||
|
|
||
| ```shell | ||
| git remote add upstream git@github.com:kubeflow/kubeflow.git | ||
| git remote set-url --push upstream DISABLE | ||
| ``` | ||
| When the bot detects a change in the upstream, it will create a new PR. | ||
| [**Example PR**](https://github.com/opendatahub-io/kubeflow/pull/9). | ||
|
|
||
| ## Approving PR | ||
|
|
||
| Fetch the latest changes in the Kubeflow repository: | ||
| This PR won't be merged until it is approved by using the [**Openshift CI | ||
| commands**](https://prow.k8s.io/command-help). | ||
|
|
||
| The PR is created with the `do-not-merge/hold` label to avoid automatic merge. | ||
| When you want to approve the PR, firstly remove this label by adding the | ||
| following comment to the PR: | ||
|
|
||
| ```shell | ||
| git fetch upstream -p | ||
| /unhold | ||
| ``` | ||
|
|
||
| Rebase and favor local changes upon conflicts: | ||
| Finally, add a comment in the PR to approve it: | ||
|
|
||
| ```shell | ||
| git rebase -Xtheirs upstream/main | ||
| /approve | ||
| ``` | ||
|
|
||
| *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).* | ||
| Wait until the PR is automatically merged. | ||
|
|
||
| Finally, push these changes to the ODH repository: | ||
| ## Pull Configuration | ||
|
|
||
| ```shell | ||
| git push origin --force | ||
| ``` | ||
| The **Pull GitHub App** is configured in the [pull.yml file](.github/pull.yml). |