Figured out the true way to Git for Eclipse....
Merge remote-tracking branch 'origin/master'

Conflicts:
	QNX/.metadata/.log
	QNX/.metadata/.plugins/com.qnx.tools.ide.qde.core/qdeBuildInfo
	QNX/.metadata/.plugins/org.eclipse.cdt.core/.log
	QNX/.metadata/.plugins/org.eclipse.cdt.core/ClassDemo.1412624809031.pdom
	QNX/.metadata/.plugins/org.eclipse.cdt.ui/dialog_settings.xml
	QNX/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	QNX/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	QNX/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
	QNX/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	QNX/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml