Git

Tags:
• code
• boilerplate

Merge using 'theirs' or 'ours'

git checkout --theirs *
git checkout --ours *

There is a dire need for a well-featured git client for Android devices that is free and open source... agit made an attempt, but it seems like a reimplementation in Java and is pull-only. What a hassle!