Lines Matching refs:main

9 -----------B----------D----------   main
89 # Upload the merge commit to the main branch
96     * It has the same layout as the ojluni/ files in `aosp/main`
112       `expected_upstream` into `aosp/main` branch.
114     * Please remove the file on both `aosp/main` and `aosp/expected_upstream`
116 3. Revert the merge commit on `aosp/main` from `expected_upstream`
117     * If you don't plan to re-land your change on `aosp/main`, you should
128 manually, you should make the change on `aosp/main`.
132       directly on `aosp/main`
134     * You can make the change directly on `aosp/main`. Please follow this
139       should do so on the `aosp/main` branch.
142       change directly on `aosp/main`.
154 --------------------D---E------   main
183 --------------------D---E------   main
219   an error when checking out the branch that is based on main.