Flashed it last night, and so far it seems to be working fine . If I want to include patches that have not yet been merged, I assume I need to use one of the commands listed under download on Gerrit. Which of the 4 different commands should you use (checkout, pull, cherry-pick, patch) or does it not matter?
I use Pull. Seems to work. Downloads and applies the patch. Not entirely sure of the difference between the 4 choices to be honest!
This might be obvious, but it wasn't to me the first time: make sure you're in the appropriate directory for the project before running the command. So for http://review.cyanog...om/#change,8647
you would need to be in device\zte\blade as indicated by the project at the top left.
Whilst on the subject of not being 100% sure what I'm doing. What;s the procedure if you cock up?
I pulled this and it failed to merge: http://review.cyanog...om/#change,9811
because in the meantime it had been added to the above linked change. And I couldn't pull anything else until resolving the merge conflict. I basically just wanted to undo that pull
A google search suggested 'git reset --merge' and this seemed to solve my problem. Would that be the correct method? Or is there a more correct way. It also seemed to rescue me when I managed an aforementioned download of a patch into the wrong project directory.
This git stuff is way more complex than the windows source code control programs I'm used to!!
Edited by targetbsp, 07 November 2011 - 02:34 PM.