I have a couple of basic questions. We (My team and I) would like to be able to download aosp to our local machine, work on platform/frameworks, make, upload our changes to review server side and be able to update aosp on the review server side without losing our changes. I used gerrit. As basePath I set an android mirror (repo init -u https://android.googlesource.com/mirror/manifest --mirror) Now we can repo init from our server side and repo upload indeed uploads the changes. But the problem is : repo sync on the server on aosp mirror deletes our merged changes. What is wrong here? Are we working correctly? Is there an accepted way to work on aosp using gerrit? i.e. can mirror be used to repo upload commits?