Switch release channel

This section describes how to switch between different release channels for Rok. In the following commands, we assume that we currently track the release-1.0 channel, and we want to upgrade our deployments repo to track the release-1.1 one. Please update your commands accordingly to much the source and destination release channels for your environment.

  1. Ensure that you are currently on the correct release channel:

    $ git rev-parse --abbrev-ref --symbolic-full-name @{u}
    origin/release-1.0
    
  2. Switch to the release-1.1 channel and rebase you work on top of that:

    $ git rebase -Xtheirs --onto origin/release-1.1 origin/release-1.0
    

    Rebasing your work, may cause conflicts, e.g., when a file was modified locally but removed from upstream, for example:

    CONFLICT (modify/delete): kubeflow/kfctl_config.yaml deleted in origin/release-1.1 and modified in HEAD~61. Version HEAD~61 of kubeflow/kfctl_config.yaml left in tree.
    

    We suggest that you go ahead and delete those files, e.g.:

    $ git status --porcelain | awk '{if ($1=="DU") print $2}' | xargs git rm
    

    And proceed with the rebase:

    $ git rebase --continue
    
  3. Configure the local branch to track the new release channel:

    $ git branch --set-upstream-to=origin/release-1.1