Git Town

Minimize merge conflicts by keeping your local Git branches in sync with their remote counterpart on GitHub by regularly running git town sync from the Git Town toolkit.