Git checkout - b studio - master - dev - t aosp / studio - master - dev Git branch - D studio - master - dev studio - master - dev - osx # Merge the mirror into studio-master-dev and upload to gerritĬOMMIT_MSG = 'Merge 'jetbrains-master-mirrorSUFFIX' into studio-master-devSUFFIX' # edit as needed. Git push aosp local_copy - osx : refs / heads / jetbrains - master - mirror - osx Git push aosp local_copy : refs / heads / jetbrains - master - mirror # Fetch changes and push to jetbrains-master-mirror. Git branch - D local_copy local_copy - osx Git checkout aosp / studio - master - dev # to make sure local_copy isn't checked out PROJECT_NAME = $ ( basename $REPO_PROJECT ) # Make sure we're in a clean state. Create a script called merge.sh with the following contents and grant it execute permissions:.Repo init - u persistent - https :// googleplex - android. So, any change made should be available for both branches. There is an auto-merger from studio-master-dev to studio-master-dev-osx. Any changes made by us, should be made to studio-master-dev. After importing the changes from jetbrains into these mirror branches, we can merge them into studio-master-dev and studio-master-dev-osx.

No change should be made directly to these branches and they should track the upstream bit-for-bit. These map to jetbrains-master-mirror and jetbrains-master-mirror-osx respectively in our tree. The master branch is used for linux and windows. JetBrains's projects have two branches - master and master-osx that we need to track. Before doing these, you need forge-author, forge-committer and direct-push permissions for the relevant projects in jetbrains-master-mirror and jetbrains-master-mirror-osx branches. This document describes how to import changes from upstream repo ( *.git).

Android studio git push