Commit ba1b44d5 authored by 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's avatar 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
Browse files

resolved conflicts for a18ebd19 to klp-modular-dev 

Change-Id: I1cd7c9a1a026e73f4e7ff7cc8ae69fc269866640
parents d59d0d7a a18ebd19
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment