Git Process - SimonCapewell/enigma2 GitHub Wiki

Git Setup

• Fork OpenViX/enigma2 in Github
• Now you have a new repository on your account called yourusername/enigma2
• Clone that to your development machine
• Set OpenViX/enigma2 as a remote on your local clone

Now you're ready to start making some changes

• Create a feature branch based on Dev
• Never commit any changes to the Dev branch on your local clone

To keep your fork's Dev branch in sync with OpenViX/enigma2/Dev

git pull --rebase upstream Dev

Always use --rebase to avoid merge commits appearing in the history