Skip to content

Instantly share code, notes, and snippets.

Show Gist options
  • Select an option

  • Save soupslurpr/7bd52a144a731d24728668b0b92046b3 to your computer and use it in GitHub Desktop.

Select an option

Save soupslurpr/7bd52a144a731d24728668b0b92046b3 to your computer and use it in GitHub Desktop.
updating development code when fetching new commits for GrapheneOS development

You can add your fork of needed repos as a separate remote. example.

When you repo sync, the GrapheneOS repos will be checked out again. repo sync tries to automatically rebase the current branch by default when syncing, which often doesn't work. To prevent that, you need to use the --detach option which will checkout the manifest commit without touching the current local branch. You can switch the branch in needed repos to your fork again after sync. You can then rebase if needed.

example of adding a fork of frameworks/base as a separate remote

cd ~/grapheneos-15
cd frameworks/base
git remote add origin https://github.com/USERNAME/platform_frameworks_base/
git fetch origin
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment