JerryScript
Daydream Believer
Git allows you to keep multiple repos together using branching. I'm just learning the ins-n-outs, so anyone that sees something wrong in what follows, please correct me!
cd ~/WORKING_DIR/android/device/lge/thunderc
git checkout ics
git remote add BobZhome git://github.com/BobZhome/android_device_lge_thunderc.git
git fetch BobZhome
git status
(check things out, correct conflicts/fast-forwards/etc)
git merge BobZhome ics
git commit -a -m "Synced with BobZhome's ICS"
This should allow you to keep a working copy of Bob's stuff, without messing up your gingerbread branch. To switch back to gingerbread, git checkout gingerbread.
cd ~/WORKING_DIR/android/device/lge/thunderc
git checkout ics
git remote add BobZhome git://github.com/BobZhome/android_device_lge_thunderc.git
git fetch BobZhome
git status
(check things out, correct conflicts/fast-forwards/etc)
git merge BobZhome ics
git commit -a -m "Synced with BobZhome's ICS"
This should allow you to keep a working copy of Bob's stuff, without messing up your gingerbread branch. To switch back to gingerbread, git checkout gingerbread.