Dealing w/Gerrit Conflicts

resolve_gerrit_conficts

Need to flush out:

git checkout chrischanges 
git pull https://tinfoil.blah.com/gerrit/platform/packages/apps/Settings refs/changes/12/112/1

git add src/com/blah/blah/Utils.java
git commit -a
git rebase --continue
git add src/com/blah/blah/Utils.java
git push ssh://cpiekarski@tinfoil.blah.com:29418/platform/packages/apps/Settings chrischanges:refs/for/balh/android-4.1.2_r1

#merge related conflicts
repo sync .
git checkout -b cjpmerge
git pull [url from gerrit change id]
*resolve path issue*
git commit -a
git push [gerrit project/branch url]
*Approve new merge change-id and then the original conflicting change change-id*