Lines Matching refs:merge

13 `git merge` from an OpenJDK branch. However, each file in `ojluni/` can come
15 storing the OpenJDK version of each file. Thus, we can use `git merge` when
17 automatically merge the file if no merge conflict.
47 `ojluni_merge_to_main` will `git-merge` from the upstream branch.
48 If you see any merge conflicts, please resolve the merge conflicts as usual,
55 # -a imports more files into the last merge commit instead of a new commit
76 # -a imports more files into the last merge commit instead of a new commit
89 # Upload the merge commit to the main branch
111       import the file from the upstream. Later, you can merge the file and
116 3. Revert the merge commit on `aosp/main` from `expected_upstream`
120       a merge commit, because `git` doesn't allow you to merge the same commit
124         2. Just accept that the re-landing commit won't be a merge commit.
165         * Otherwise, gerrit will create another merge commit from `A` without
192 * Commit `D` is a merge commit created by `git merge`
209     3. Try to upload the merge commits 1 by 1