diff options
| author | cd /gitc/manifest-rw/klp-modular-dev-gitc-merge repo sync export OUT_DIR=/usr/local/google/gitc/klp-modular-dev-gitc-merge/out # This should take 30 seconds to setup the full klp-modular-dev branch. # To resolve the conflict, next we need to clone the repo project: cd libcore # Create a new, unique branch. Note this will clone the project and may take a while the first time, depending on the size of the repo project. repo start manual_merge_a18ebd19 . git fetch goog a18ebd194ea82c5190f86fe62b56f0e46b1b36cd git merge a18ebd194ea82c5190f86fe62b56f0e46b1b36cd # Fix the conflict (markers are in the file); Build & Test; git add # (files you changed) git commit -m "resolved conflicts for a18ebd19 to klp-modular-dev" repo upload . # get approval, submit <dxie@google.com> | 2015-09-28 21:37:04 -0700 |
|---|---|---|
| committer | cd /gitc/manifest-rw/klp-modular-dev-gitc-merge repo sync export OUT_DIR=/usr/local/google/gitc/klp-modular-dev-gitc-merge/out # This should take 30 seconds to setup the full klp-modular-dev branch. # To resolve the conflict, next we need to clone the repo project: cd libcore # Create a new, unique branch. Note this will clone the project and may take a while the first time, depending on the size of the repo project. repo start manual_merge_a18ebd19 . git fetch goog a18ebd194ea82c5190f86fe62b56f0e46b1b36cd git merge a18ebd194ea82c5190f86fe62b56f0e46b1b36cd # Fix the conflict (markers are in the file); Build & Test; git add # (files you changed) git commit -m "resolved conflicts for a18ebd19 to klp-modular-dev" repo upload . # get approval, submit <dxie@google.com> | 2015-09-28 21:37:04 -0700 |
| commit | ba1b44d5f54cb3c61ff4747dc356dfc7be614972 (patch) | |
| tree | 4436717d100ff61279c0a332eded42738bd034a4 | |
| parent | d59d0d7a7248246d43a58fe417880867a34631f9 (diff) | |
| parent | a18ebd194ea82c5190f86fe62b56f0e46b1b36cd (diff) | |
| download | libcore-ba1b44d5f54cb3c61ff4747dc356dfc7be614972.zip libcore-ba1b44d5f54cb3c61ff4747dc356dfc7be614972.tar.gz libcore-ba1b44d5f54cb3c61ff4747dc356dfc7be614972.tar.bz2 | |
resolved conflicts for a18ebd19 to klp-modular-dev
Change-Id: I1cd7c9a1a026e73f4e7ff7cc8ae69fc269866640
0 files changed, 0 insertions, 0 deletions