Personal tools

Talk:Git for dummies

From OpenEMR Project Wiki

Jump to: navigation, search

Under "Committing to the official git repository on GitHub (cherry-pick method) (For Integration Developers)" ... Instead of the cherry-picks why not just "git merge <your-branch>"?

Under "Committing other user's code to the official git repository on GitHub (quick and safe method) (For Integration Developers)" ... Not sure I like cherry-picking from the user's remote branch into the master branch. Cherry-picks can fail with conflicts. Seems better to create a temporary local branch from master and cherry-pick into that, then proceed as in the previous section.