Committing - hpgDesigns/hpg_projects GitHub Wiki

This article is an overview of committing to the ENIGMA project, these should make you more familiar with working github.

Fixing Merge Conflicts

git remote add upstream https://github.com/enigma-dev/enigma-dev.git
git fetch upstream
git merge upstream/master